impel-cli 0.20.43 → 0.20.45

package/README.md

@@ -188,6 +188,16 @@ impel claude --agent research-agent --print "answer this question"
 impel codex --agent research-agent exec "answer this question"
 ```
 
+Claude profiles also generate `/ask-<agent>` commands for synchronized,
+read-only agents that support direct answers. The generated command invokes
+the exact tenant-bound agent, attributes the response, and returns its answer
+verbatim; the ordinary relay subagent remains available. To suppress these
+additive commands and remove previously generated ones on the next sync, run:
+
+```sh
+IMPEL_NATIVE_SLASH_COMMANDS=0 impel agents sync claude
+```
+
 Both managed paths verify the selected tenant manifest and generated adapter
 bytes, resolve the canonical native agent name, and omit the normal parent
 specialist instructions. Claude Code receives the explicit 2.1.220 opt-in and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.20.43",
+  "version": "0.20.45",
   "description": "Prepare isolated Claude and Codex workspaces for every accessible Impel tenant",
   "type": "module",
   "bin": {

package/src/agents.js

@@ -46,6 +46,7 @@ import {
   claudeFaithfulCompletionGuidance,
   claudeVerbatimCompletionGuidance,
   customAgentVerbatimDescriptionLead,
+  VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT,
   usesVerbatimRelay,
 } from "./verbatimRelay.js";
 import { renameWithWindowsRetry } from "./windowsFs.js";
@@ -64,7 +65,7 @@ export const NATIVE_AGENT_RESUME_TOOL = "resume_native_agent_run";
 export const NATIVE_AGENT_RECOVER_TOOL = "recover_native_agent_runs";
 export const NATIVE_AGENT_CONTINUATION_SCHEMA = "impel.native-agent-continuation.v1";
 export const MANAGED_AGENT_MCP_SERVER = "impel_agent";
-export const MANAGED_AGENT_MANIFEST_VERSION = 23;
+export const MANAGED_AGENT_MANIFEST_VERSION = 24;
 export const IMPEL_NATIVE_PARENT_DIRECT_ENV = "IMPEL_NATIVE_PARENT_DIRECT";
 export const IMPEL_NATIVE_SLASH_COMMANDS_ENV = "IMPEL_NATIVE_SLASH_COMMANDS";
 
@@ -88,8 +89,11 @@ function eagerNativeAgentTransportEnabled() {
   return process.env.IMPEL_NATIVE_EAGER_TRANSPORT !== "0";
 }
 
-function enabledProfileFlag(environment, name) {
-  return ["1", "true"].includes(String(environment?.[name] || "").toLowerCase());
+function enabledProfileFlag(environment, name, { defaultEnabled = false } = {}) {
+  const configured = String(environment?.[name] || "").toLowerCase();
+  if (["1", "true"].includes(configured)) return true;
+  if (["0", "false"].includes(configured)) return false;
+  return defaultEnabled;
 }
 
 export function nativeParentDirectEnabled(environment = process.env) {
@@ -97,7 +101,11 @@ export function nativeParentDirectEnabled(environment = process.env) {
 }
 
 export function nativeSlashCommandsEnabled(environment = process.env) {
-  return enabledProfileFlag(environment, IMPEL_NATIVE_SLASH_COMMANDS_ENV);
+  // This surface is additive: the relay agent remains installed. Keep the
+  // explicit false literals as a symmetric rollback for managed profiles.
+  return enabledProfileFlag(environment, IMPEL_NATIVE_SLASH_COMMANDS_ENV, {
+    defaultEnabled: true,
+  });
 }
 const MAX_RETIRED_AGENT_BINDINGS = 50;
 const MAX_NATIVE_AGENT_STATE_BYTES = 512 * 1024;
@@ -919,6 +927,7 @@ function claudeParentDirectInstructions(tenantId, agent) {
     `Call ${nativeToolName(NATIVE_AGENT_ANSWER_TOOL)} exactly once with question set to the user's complete request. Do not spawn a relay subagent and do not perform the request yourself.`,
     `If the answer returns an object whose schema is exactly ${JSON.stringify(NATIVE_AGENT_CONTINUATION_SCHEMA)}, pass that complete object unchanged as the handle to ${nativeToolName(NATIVE_AGENT_RESUME_TOOL)} until terminal; after a continuation exists, never call the answer tool again.`,
     `On success, present the attribution line ${JSON.stringify(attribution)}, followed by the returned finalText verbatim with no rewriting, Markdown changes, or independent synthesis. On failure, attribute the failure to the same named managed agent and do not invent a replacement answer.`,
+    ...(usesVerbatimRelay(agent) ? [VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT] : []),
   ].join(" ");
 }
 
@@ -1124,6 +1133,7 @@ export function renderManagedAgents(client, tenantId, agents, invocation = null,
       policyFingerprint: nativeAgentPolicyFingerprint(agent),
       retired: false,
       name,
+      ...(usesVerbatimRelay(agent) ? { verbatimRelay: true } : {}),
       fileName: parentDirect ? null : `${fileStem}${extension}`,
       contents,
       ...(claudeRendered ? { launchDefinition: claudeRendered.launchDefinition } : {}),
@@ -1167,6 +1177,7 @@ function renderClaudeSlashCommand(tenantId, agent, commandName, invocation) {
     "",
     `The JSON below came from managed agent ${JSON.stringify(agent.title)} (${agent.agentId}), not from the host model.`,
     `Run the fixed command exactly once. If ok is true, output the attribution line ${JSON.stringify(attribution)} followed by finalText verbatim. If ok is false, attribute the reported error to the same managed agent. Do not perform, rewrite, or independently answer the task.`,
+    ...(usesVerbatimRelay(agent) ? [VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT] : []),
     "",
     `!\`${bashCommand}\``,
     "",
@@ -1669,22 +1680,23 @@ function profileIsFresh(profile, tenantId, now, ttlMs) {
   if (!Array.isArray(manifest.files) || !manifest.contentDigests
     || typeof manifest.contentDigests !== "object"
     || Array.isArray(manifest.contentDigests)) return false;
+  const profileEnvironment = profile.environment ?? process.env;
   const expectedDirectProfiles = profile.client === "codex" && profile.directProfiles !== false;
   const expectedDirectCodeMode = profile.client === "codex" && profile.directCodeMode !== false;
   const expectedNativeParentDirect = profile.client === "claude"
-    && (profile.nativeParentDirect ?? nativeParentDirectEnabled());
+    && (profile.nativeParentDirect ?? nativeParentDirectEnabled(profileEnvironment));
   const expectedNativeSlashCommands = profile.client === "claude"
-    && (profile.nativeSlashCommands ?? nativeSlashCommandsEnabled());
+    && (profile.nativeSlashCommands ?? nativeSlashCommandsEnabled(profileEnvironment));
   const expectedNativeIntercept = profile.client === "claude"
-    && (profile.nativeIntercept ?? nativeInterceptEnabled());
+    && (profile.nativeIntercept ?? nativeInterceptEnabled(profileEnvironment));
   const expectedNativeInterceptTimeoutMs = expectedNativeIntercept
-    ? (profile.nativeInterceptTimeoutMs ?? nativeInterceptTimeoutMs())
+    ? (profile.nativeInterceptTimeoutMs ?? nativeInterceptTimeoutMs(profileEnvironment))
     : null;
   const expectedTelemetryEnvironment = nativeAgentTelemetryEnvironment(
-    profile.environment ?? process.env,
+    profileEnvironment,
   );
   const expectedBenchmark = nativeBenchmarkHeaderValue(
-    profile.environment ?? process.env,
+    profileEnvironment,
   ) !== null;
   if (manifest.directProfiles !== expectedDirectProfiles
     || manifest.directCodeMode !== expectedDirectCodeMode
@@ -1729,11 +1741,13 @@ export function syncAgentProfile({
   agents,
   directProfiles = client === "codex",
   directCodeMode = client === "codex",
-  nativeParentDirect = client === "claude" && nativeParentDirectEnabled(),
-  nativeSlashCommands = client === "claude" && nativeSlashCommandsEnabled(),
-  nativeIntercept = client === "claude" && nativeInterceptEnabled(),
-  nativeInterceptTimeoutMs: interceptTimeoutMs = nativeIntercept ? nativeInterceptTimeoutMs() : null,
   environment = process.env,
+  nativeParentDirect = client === "claude" && nativeParentDirectEnabled(environment),
+  nativeSlashCommands = client === "claude" && nativeSlashCommandsEnabled(environment),
+  nativeIntercept = client === "claude" && nativeInterceptEnabled(environment),
+  nativeInterceptTimeoutMs: interceptTimeoutMs = nativeIntercept
+    ? nativeInterceptTimeoutMs(environment)
+    : null,
   invocation = null,
   now = Date.now(),
   nativeAgentRunsRoot = path.join(CONFIG_DIR, "native-agent-runs"),
@@ -1966,6 +1980,7 @@ export function syncAgentProfile({
       policyFingerprint: agent.policyFingerprint,
       retired: agent.retired,
       name: agent.name,
+      ...(agent.verbatimRelay ? { verbatimRelay: true } : {}),
       ...(client === "claude" ? {
         ...(agent.parentLaunchDefinition
           ? { launchMode: "parent-direct", parentLaunchDefinition: agent.parentLaunchDefinition }

package/src/apps.js

@@ -302,6 +302,10 @@ export function managedAppIdentity(target, tenantId = null, tenantName = null) {
 // 35: enable the Code Mode host in managed desktop profiles (pinned Codex
 // fails closed on code_mode_only models without it) and serve CLI model
 // catalogs from the shared registry so efforts and tiers cannot drift.
+// 36: install attributed /ask-<agent> slash commands for read-only direct
+// answers in managed Claude profiles by default.
+// 37: forbid external retrieval and citation edits on every opt-in
+// verbatim-relay surface.
 export { CURRENT_CONFIG_VERSION };
 
 // Identifies the bundle-BUILDING logic — the asar patches, plist rewrites,

package/src/commands/apps.js

@@ -52,7 +52,6 @@ import {
   ensureWindowsClaudeApp,
   ensureWindowsChatGPTApp,
   findWindowsClaudeApp,
-  findWindowsChatGPTApp,
   findManagedWindowsChatGPTApp,
   launchWindowsClaudeApp,
   pinnedWindowsChatGPTApp,
@@ -424,8 +423,11 @@ export async function reconcileWindowsTenantApps({
   // missing vendor app) must not abort the other target's work: install
   // recovery approves one vendor app at a time, and that approved install
   // has to run even while its sibling stays missing.
+  // `reason` distinguishes a real installer failure from the synthetic decline
+  // recorded when a caller (install recovery) approved only the sibling app, so
+  // callers can attribute each failure to the product that actually failed.
   const failed = [];
-  const fail = (target, error) => failed.push({ target, error });
+  const fail = (target, error, reason = "install-failed") => failed.push({ target, error, reason });
   const hasFailed = (target) => failed.some((failure) => failure.target === target);
 
   for (const target of actionTargets) {
@@ -437,7 +439,11 @@ export async function reconcileWindowsTenantApps({
     if (!preparedTargets.has(target)) {
       const confirmed = await confirmVendorInstall(target, { platform: "win32", mode });
       if (!confirmed) {
-        fail(target, `${label} vendor ${mode === "update" ? "update" : "installation"} requires confirmation`);
+        fail(
+          target,
+          `${label} vendor ${mode === "update" ? "update" : "installation"} requires confirmation`,
+          "confirmation-required",
+        );
         continue;
       }
       const vendor = await ensure({ update: mode === "update" }, { environment, homeDir });
@@ -568,13 +574,13 @@ export async function reconcileMacTenantApps({
   // target so the sibling app still converges (install recovery approves one
   // vendor app at a time).
   const failed = [];
-  const fail = (target, error) => failed.push({ target, error });
+  const fail = (target, error, reason = "install-failed") => failed.push({ target, error, reason });
   const hasFailed = (target) => failed.some((failure) => failure.target === target);
   for (const target of actionTargets.filter((target) => !preparedTargets.has(target))) {
     if (vendorPaths[target]) continue;
     const confirmed = await confirmVendorInstall(target, { platform: "darwin", mode });
     if (!confirmed) {
-      fail(target, `${target} vendor installation requires confirmation`);
+      fail(target, `${target} vendor installation requires confirmation`, "confirmation-required");
       continue;
     }
     const result = await io.ensureVendor(target, { homeDir });

package/src/commands/converge.js

@@ -6,12 +6,12 @@ import {
   printReconciliationSummary,
   reconcileAllTenants,
   selectDefaultTenant,
-  vendorAppTargetReady,
 } from "../provisioning.js";
 import { fetchTenants } from "../tenants.js";
 import { promptText } from "../prompt.js";
 import { describeCliFailure, preparePlatformClis } from "../platformSetup.js";
 import { restoreNativeProfiles } from "./use.js";
+import { createTenantRecoveryReportTracker } from "./tenantRecoveryReport.js";
 
 const RETRYABLE_TENANT_DISCOVERY_ERROR = /could not reach|request timed out|fetch failed|ECONNRESET|ECONNABORTED|ETIMEDOUT|EAI_AGAIN|ENETUNREACH|network error|socket/iu;
 
@@ -19,17 +19,6 @@ function confirmed(answer) {
   return /^(?:y|yes)$/iu.test(String(answer || "").trim());
 }
 
-function mergeTenantReport(report, replacement) {
-  const byId = new Map(replacement.tenants.map((tenant) => [tenant.tenantId, tenant]));
-  report.tenants = report.tenants.map((tenant) => byId.get(tenant.tenantId) || tenant);
-  report.passed = report.tenants.every((tenant) => (
-    ["ready", "unavailable"].includes(tenant.cli)
-    && ["ready", "unavailable"].includes(tenant.apps)
-    && ["ready", "unavailable"].includes(tenant.shell)
-  ));
-  return report;
-}
-
 export async function cmdConverge(argv = [], overrides = {}) {
   const skipApps = argv.includes("--skip-apps");
   const skipClis = argv.includes("--skip-clis");
@@ -264,12 +253,14 @@ export async function cmdConverge(argv = [], overrides = {}) {
       if (!tenant) continue;
       let retryReport = null;
       let retryPassed = false;
+      const recoveryReport = createTenantRecoveryReportTracker(report);
       const retryTenant = async (confirmInstall) => {
         retryReport = await run([tenant], !skipApps, confirmInstall);
         retryPassed = retryReport.passed;
         return retryPassed;
       };
       const retrySafeState = async () => {
+        recoveryReport.clearVendorAppAttempt();
         const profileReport = await run([tenant], false, async () => false);
         const profile = profileReport.tenants[0];
         const current = report.tenants.find((candidate) => candidate.tenantId === tenant.id);
@@ -321,23 +312,13 @@ export async function cmdConverge(argv = [], overrides = {}) {
           // sibling app still fails: the goal check keeps demanding full
           // tenant readiness, so recovery can approve one app at a time.
           installVendorApp: async (target) => {
-            await retryTenant(async (product) => (
-              target === "all"
-              || product === target
-              || (target === "codex" && product === "chatgpt")
-            ));
-            const installed = vendorAppTargetReady(retryReport, target);
-            return {
-              installed,
-              error: installed
-                ? null
-                : retryReport?.tenants?.[0]?.errors?.join("; ")
-                  || `The ${target} vendor app did not reach a verified state.`,
-            };
+            const attempt = recoveryReport.vendorAppAttempt(target);
+            await retryTenant(attempt.confirm);
+            return attempt.outcome(retryReport);
           },
         },
       }, overrides.recoveryOverrides || {});
-      if (retryReport) mergeTenantReport(report, retryReport);
+      if (retryReport) report = recoveryReport.merge(retryReport);
     }
   }
   printReconciliationSummary(report);

package/src/commands/setup.js

@@ -16,7 +16,6 @@ import {
   printReconciliationSummary,
   reconcileAllTenants,
   selectDefaultTenant,
-  vendorAppTargetReady,
 } from "../provisioning.js";
 import { describeCliFailure, preparePlatformClis } from "../platformSetup.js";
 import { runInstallRecovery } from "../installRecovery/engine.js";
@@ -27,7 +26,9 @@ import {
   cacheProviderReadiness,
   probeGatewayProviderReadiness,
   providerAvailable,
+  PROVIDER_READINESS_TIMEOUTS_MS,
 } from "../providerReadiness.js";
+import { createTenantRecoveryReportTracker } from "./tenantRecoveryReport.js";
 
 const HELP = brandedText(`impel setup - prepare every accessible Impel tenant
 
@@ -57,7 +58,13 @@ export function resolveTenantChoice(listing, { requested = null, answer = null,
   return selectDefaultTenant(listing, { currentTenantId });
 }
 
-export async function probeGateway(gatewayUrl, pat, tenantId, fetchImpl = fetch, timeoutsMs = [5_000, 10_000]) {
+export async function probeGateway(
+  gatewayUrl,
+  pat,
+  tenantId,
+  fetchImpl = fetch,
+  timeoutsMs = PROVIDER_READINESS_TIMEOUTS_MS,
+) {
   return probeGatewayProviderReadiness(
     gatewayUrl,
     tenantCredential(pat, tenantId),
@@ -112,12 +119,6 @@ function recomputeReport(report) {
   return report;
 }
 
-function mergeTenantReport(report, replacement) {
-  const byId = new Map(replacement.tenants.map((tenant) => [tenant.tenantId, tenant]));
-  report.tenants = report.tenants.map((tenant) => byId.get(tenant.tenantId) || tenant);
-  return recomputeReport(report);
-}
-
 function confirmed(answer) {
   return /^(?:y|yes)$/iu.test(String(answer || "").trim());
 }
@@ -416,12 +417,14 @@ export async function cmdSetup(argv, overrides = {}) {
       if (!tenant) continue;
       let retryReport = null;
       let retryPassed = false;
+      const recoveryReport = createTenantRecoveryReportTracker(report);
       const retryTenant = async (confirmInstall) => {
         retryReport = await verifyConvergence(!flags["skip-apps"], [tenant], confirmInstall);
         retryPassed = retryReport.passed;
         return retryPassed;
       };
       const retrySafeState = async () => {
+        recoveryReport.clearVendorAppAttempt();
         const profileReport = await verifyConvergence(false, [tenant], async () => false);
         const profile = profileReport.tenants[0];
         const current = report.tenants.find((candidate) => candidate.tenantId === tenant.id);
@@ -474,23 +477,13 @@ export async function cmdSetup(argv, overrides = {}) {
           // sibling app still fails: the goal check keeps demanding full
           // tenant readiness, so recovery can approve one app at a time.
           installVendorApp: async (target) => {
-            await retryTenant(async (product) => (
-              target === "all"
-              || product === target
-              || (target === "codex" && product === "chatgpt")
-            ));
-            const installed = vendorAppTargetReady(retryReport, target);
-            return {
-              installed,
-              error: installed
-                ? null
-                : retryReport?.tenants?.[0]?.errors?.join("; ")
-                  || `The ${target} vendor app did not reach a verified state.`,
-            };
+            const attempt = recoveryReport.vendorAppAttempt(target);
+            await retryTenant(attempt.confirm);
+            return attempt.outcome(retryReport);
           },
         },
       }, overrides.recoveryOverrides || {});
-      if (retryReport) mergeTenantReport(report, retryReport);
+      if (retryReport) report = recoveryReport.merge(retryReport);
     }
   }
   recomputeReport(report);

package/src/commands/tasks.js

@@ -10,7 +10,15 @@ import {
   PRODUCT_ACCESS_WORKSPACE,
 } from "../tenants.js";
 
-const VALID_PROGRESS = new Set(["none", "todo", "progress", "review", "done"]);
+export const TASK_PROGRESS_VALUES = [
+  "none",
+  "todo",
+  "progress",
+  "review",
+  "done",
+  "cancelled",
+];
+const VALID_PROGRESS = new Set(TASK_PROGRESS_VALUES);
 const VALID_PRIORITY = new Set(["none", "urgent", "high", "medium", "low"]);
 const VALID_LABELS = new Set(["feature", "bug", "engineering", "design", "product"]);
 
@@ -35,7 +43,7 @@ Options:
   --description <markdown>          Ticket body markdown.
   --description-file <path>         Read ticket body markdown from a file.
   --description-mode replace|append Description update mode. Default: replace.
-  --progress none|todo|progress|review|done
+  --progress none|todo|progress|review|done|cancelled
   --priority none|urgent|high|medium|low
   --labels <csv>                    Full label set, e.g. feature,engineering. Empty clears labels.
   --assignee <id|none>              Assignee member id, or "none".

package/src/commands/tenantRecoveryReport.js

@@ -0,0 +1,101 @@
+import {
+  recomputeTenantAggregates,
+  vendorAppTargetReady,
+} from "../provisioning.js";
+
+function reportPassed(tenants) {
+  return tenants.every((tenant) => (
+    ["ready", "unavailable"].includes(tenant.cli)
+    && ["ready", "unavailable"].includes(tenant.apps)
+    && ["ready", "unavailable"].includes(tenant.shell)
+  ));
+}
+
+function mergeTenantReports(report, replacement, products) {
+  const byId = new Map(replacement.tenants.map((tenant) => [tenant.tenantId, tenant]));
+  const tenants = report.tenants.map((tenant) => {
+    const attempted = byId.get(tenant.tenantId);
+    if (!attempted || !products) return attempted || tenant;
+
+    const clients = { ...attempted.clients };
+    const declined = [];
+    const restored = [];
+    for (const product of ["claude", "codex"]) {
+      if (products.includes(product)) continue;
+      const attempt = clients[product];
+      const prior = tenant.clients[product];
+      if (!prior || attempt?.appErrorReason !== "confirmation-required") continue;
+      if (attempt.appError) declined.push(attempt.appError);
+      clients[product] = {
+        ...attempt,
+        app: prior.app,
+        shell: prior.shell,
+        appError: prior.appError,
+        appErrorReason: prior.appErrorReason,
+      };
+      if (prior.appError) restored.push(prior.appError);
+    }
+    if (!declined.length && !restored.length) return attempted;
+
+    const kept = attempted.errors.filter((error) => !declined.includes(error));
+    // recomputeTenantAggregates mutates its argument, so give it a fresh
+    // tenant and client map rather than the replacement report's tenant.
+    return recomputeTenantAggregates({
+      ...attempted,
+      clients,
+      errors: [...new Set([...kept, ...restored])],
+    });
+  });
+  return { ...report, tenants, passed: reportPassed(tenants) };
+}
+
+function vendorAppOutcome(retryReport, target, products) {
+  const installed = vendorAppTargetReady(retryReport, target);
+  if (installed) return { installed: true, error: null };
+
+  const attempted = retryReport?.tenants?.[0];
+  const clients = attempted?.clients;
+  const attributed = Object.values(clients || {}).some((client) => client.appError);
+  // Reports without per-client attribution (no vendor step ran, or an older
+  // shape) still fall back to the tenant's complete error list.
+  const errors = attributed
+    ? products.map((product) => clients?.[product]?.appError).filter(Boolean)
+    : attempted?.errors || [];
+  return {
+    installed: false,
+    error: errors.join("; ") || `The ${target} vendor app did not reach a verified state.`,
+  };
+}
+
+/**
+ * Keep one tenant-recovery retry's product attribution and report merge in
+ * sync. A targeted vendor retry auto-declines its sibling, so the retry's
+ * outcome must use only the requested product while the final report restores
+ * the sibling's earlier, better-known state.
+ */
+export function createTenantRecoveryReportTracker(report) {
+  let attemptedProducts = null;
+
+  return {
+    clearVendorAppAttempt() {
+      attemptedProducts = null;
+    },
+
+    vendorAppAttempt(target) {
+      const products = target === "all" ? ["claude", "codex"] : [target];
+      attemptedProducts = products;
+      return {
+        confirm: (product) => (
+          target === "all"
+          || product === target
+          || (target === "codex" && product === "chatgpt")
+        ),
+        outcome: (retryReport) => vendorAppOutcome(retryReport, target, products),
+      };
+    },
+
+    merge(replacement) {
+      return mergeTenantReports(report, replacement, attemptedProducts);
+    },
+  };
+}

package/src/managedProfileVersion.js

@@ -1,4 +1,4 @@
 // Fleet generation shared by managed-profile writers and upstream clients.
 // Keep this isolated from apps.js so latency-sensitive transports do not load
 // desktop bundle machinery just to identify their managed config contract.
-export const CURRENT_CONFIG_VERSION = 35;
+export const CURRENT_CONFIG_VERSION = 37;

package/src/providerReadiness.js

@@ -3,6 +3,7 @@ import { redactSecretText } from "./config.js";
 const PROVIDERS = new Set(["claude", "codex"]);
 const POOL_STATES = new Set(["healthy", "exhausted", "rate_limited", "expired", "no_seat"]);
 export const PROVIDER_READINESS_CACHE_MS = 60_000;
+export const PROVIDER_READINESS_TIMEOUTS_MS = Object.freeze([5_000, 10_000]);
 
 function providersFromPayload(payload) {
   if (!Array.isArray(payload?.data)) return { error: "gateway model catalog has no model data array" };
@@ -57,7 +58,8 @@ async function probeGatewayOnce(gatewayUrl, credential, tenantId, fetchImpl, tim
     let payload;
     try {
       payload = await response.json();
-    } catch {
+    } catch (error) {
+      if (error?.name === "AbortError") throw error;
       return { ...result, healthy: false, error: "gateway model catalog was not valid JSON" };
     }
     const catalog = providersFromPayload(payload);
@@ -87,7 +89,7 @@ export async function probeGatewayProviderReadiness(
   credential,
   tenantId,
   fetchImpl = fetch,
-  timeoutsMs = [5_000, 10_000],
+  timeoutsMs = PROVIDER_READINESS_TIMEOUTS_MS,
 ) {
   let probe = { reachable: false, error: "not probed" };
   for (const timeoutMs of timeoutsMs) {

package/src/provisioning.js

@@ -280,7 +280,16 @@ export async function reconcileAllTenants({
           ? "ready"
           : failedTargets.has("chatgpt") ? "failed" : "unsupported";
         result.apps = failedTargets.size ? "failed" : supported.size ? "ready" : "unavailable";
-        for (const failure of failedApps) result.errors.push(redactSecretText(failure.error));
+        // Record each failure on its own client too. `errors` keeps every
+        // message for the summary line; the per-client facets let a targeted
+        // retry tell its own failure apart from an auto-declined sibling's.
+        for (const failure of failedApps) {
+          const message = redactSecretText(failure.error);
+          const client = failure.target === "claude" ? "claude" : "codex";
+          result.clients[client].appError = message;
+          result.clients[client].appErrorReason = failure.reason || "install-failed";
+          result.errors.push(message);
+        }
       } catch (error) {
         result.apps = "failed";
         for (const client of Object.values(result.clients)) {
@@ -360,6 +369,25 @@ export function vendorAppTargetReady(report, target) {
   return converged(target === "claude" ? clients.claude : clients.codex);
 }
 
+/**
+ * Re-derive a tenant's aggregate app/shell/status fields from its per-client
+ * facets. Used after a partial merge swaps one product's facets back to an
+ * earlier, better-known state.
+ */
+export function recomputeTenantAggregates(tenant) {
+  const clients = Object.values(tenant.clients);
+  const collapse = (states) => (
+    states.includes("failed") ? "failed"
+      : states.includes("ready") ? "ready"
+        : states.includes("pending") ? "pending" : "unavailable"
+  );
+  tenant.apps = collapse(clients.map((client) => client.app));
+  tenant.shell = collapse(clients.map((client) => client.shell));
+  const states = clients.flatMap((client) => [client.cli, client.app, client.shell]);
+  tenant.status = states.includes("failed") ? "failed" : states.includes("pending") ? "partial" : "ready";
+  return tenant;
+}
+
 export function printReconciliationSummary(report, log = console.log) {
   log("Tenant readiness:");
   for (const tenant of report.tenants) {

package/src/verbatimRelay.js

@@ -13,6 +13,12 @@ export const VERBATIM_SPAWN_REQUIREMENT = 'fork_turns="none"';
 export const VERBATIM_FINAL_TEXT_CONSTRAINTS =
   "no preface, rewriting, Markdown changes, or independent synthesis";
 
+// A relayed answer is authoritative only if nothing else reached it. Hosts that
+// can browse will otherwise blend their own retrieval into the Sources section.
+export const VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT =
+  "Never search the web, browse, open URLs, or consult any source outside this agent for the request, "
+  + "and never add, merge, reorder, or replace the sources and citations it returns.";
+
 export function usesVerbatimRelay(agent) {
   return agent?.verbatimRelay === true;
 }
@@ -21,7 +27,8 @@ export function parentVerbatimRelayAppendix() {
   return (
     `When an explicit custom agent's catalog-derived description declares ${VERBATIM_RELAY_OPT_IN_MARKER}, ` +
     `spawn it with ${VERBATIM_SPAWN_REQUIREMENT} and relay its finalText verbatim with ${VERBATIM_FINAL_TEXT_CONSTRAINTS}; ` +
-    "preserve Sources sections and citations exactly. Start one child, then use one blocking wait sized for the child budget; " +
+    `preserve Sources sections and citations exactly. ${VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT} ` +
+    "Start one child, then use one blocking wait sized for the child budget; " +
     `on Codex, call wait_agent exactly once with timeout_ms=${VERBATIM_RELAY_PARENT_WAIT_MS}. Do not send follow-ups, short-poll the child, or synthesize while it is running. ` +
     "Custom agents without that declaration keep the default delegation behavior."
   );
@@ -37,7 +44,8 @@ export function customAgentVerbatimDescriptionLead() {
 export function adapterCallerSpawnGuidance(clientLabel) {
   return (
     `Callers must spawn this explicit custom ${clientLabel} agent with ${VERBATIM_SPAWN_REQUIREMENT} ` +
-    "and must relay your result verbatim; this is caller guidance and cannot enforce host spawn behavior."
+    "and must relay your result verbatim; this is caller guidance and cannot enforce host spawn behavior. " +
+    VERBATIM_NO_EXTERNAL_SOURCE_CONSTRAINT
   );
 }