impel-cli 0.19.2-beta.0 → 0.19.3

package/package.json

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

package/src/agents.js

@@ -12,15 +12,6 @@ import path from "node:path";
 import { normalizeGatewayUrl, redactSecretText } from "./config.js";
 import { impelMcpInvocation } from "./selfInvocation.js";
 import { normalizeTenantId } from "./tenants.js";
-import {
-  adapterCallerSpawnGuidance,
-  adapterHardCompletionGuidance,
-  adapterSoftCompletionGuidance,
-  claudeHardCompletionGuidance,
-  claudeSoftCompletionGuidance,
-  customAgentVerbatimDescriptionLead,
-  usesVerbatimRelay,
-} from "./verbatimRelay.js";
 import { renameWithWindowsRetry } from "./windowsFs.js";
 
 export const AGENT_SYNC_TTL_MS = 6 * 60 * 60 * 1000;
@@ -30,7 +21,7 @@ export const NATIVE_AGENT_LIST_TOOL = "impel_specialists-list_native_agents";
 export const NATIVE_AGENT_START_TOOL = "impel_specialists-start_native_agent_run";
 export const NATIVE_AGENT_READ_TOOL = "impel_specialists-read_native_agent_run";
 export const MANAGED_AGENT_MCP_SERVER = "impel_agent";
-export const MANAGED_AGENT_MANIFEST_VERSION = 5;
+export const MANAGED_AGENT_MANIFEST_VERSION = 4;
 
 const NATIVE_AGENT_TOOL_NAMES = [
   NATIVE_AGENT_LIST_TOOL,
@@ -134,9 +125,6 @@ export function normalizeNativeAgentCatalog(payload, expectedTenantId) {
       throw new Error(`native-agent catalog returned duplicate binding ${binding}`);
     }
     seenBindings.add(binding);
-    if (agent.verbatimRelay !== undefined && typeof agent.verbatimRelay !== "boolean") {
-      throw new Error("native-agent catalog returned an invalid verbatimRelay");
-    }
     return {
       agentId,
       title: boundedString(agent.title, "title", { max: 160 }),
@@ -147,7 +135,6 @@ export function normalizeNativeAgentCatalog(payload, expectedTenantId) {
       exclusions: stringList(agent.exclusions, "exclusions"),
       requiredContext: stringList(agent.requiredContext, "requiredContext"),
       sideEffects: enumString(agent.sideEffects, "sideEffects", ["read-only", "writes"]),
-      ...(agent.verbatimRelay === true ? { verbatimRelay: true } : {}),
     };
   });
   return { orgId: tenantId, agents };
@@ -342,21 +329,14 @@ function claudeAdapterInstructions(tenantId, agent) {
   const sideEffectInstruction = agent.sideEffects === "writes"
     ? `The catalog declares that this agent writes user or workspace data. Use this adapter only when the user explicitly selected this exact agent for the current request; that explicit selection is the required side-effect confirmation, so pass confirmedSideEffects true. If the agent was chosen automatically or the selection is ambiguous, do not start it and ask the user to select it explicitly.`
     : `The catalog declares that this agent is read-only; omit confirmedSideEffects.`;
-  const callerSpawnGuidance = usesVerbatimRelay(agent)
-    ? adapterCallerSpawnGuidance("Claude")
-    : null;
-  const completionGuidance = usesVerbatimRelay(agent)
-    ? claudeHardCompletionGuidance()
-    : claudeSoftCompletionGuidance();
   return [
     `You are a thin transport adapter for the exact Impel native agent ${JSON.stringify(agent.agentId)} in tenant ${JSON.stringify(tenantId)}.`,
-    ...(callerSpawnGuidance ? [callerSpawnGuidance] : []),
     `Do not perform the assigned task yourself and do not delegate to any other agent.`,
     `First call ${toolName(NATIVE_AGENT_LIST_TOOL)} and verify that the exact agentId is still available with sideEffects ${JSON.stringify(agent.sideEffects)}. If it is unavailable or its policy excludes the request, stop with that explicit error.`,
     sideEffectInstruction,
     `Call ${toolName(NATIVE_AGENT_START_TOOL)} exactly once with agentId ${JSON.stringify(agent.agentId)}, scopeParam ${JSON.stringify(agent.scopeParam)}, task set to the complete assigned task, optional context set to one string containing all supplied context (omit it when no context was supplied), contextKeys naming the context fields present in that string, confirmedSideEffects as directed above, and one stable idempotencyKey that you reuse for this logical task.${contextRequirement}`,
     `Then call ${toolName(NATIVE_AGENT_READ_TOOL)} with the returned runId and waitSeconds 20 until the run reaches a terminal state.`,
-    completionGuidance,
+    `When it succeeds, return result.finalText faithfully as the answer. When it fails, return the durable runId, preserved output, and error. Never invent or independently synthesize a replacement result.`,
   ].join(" ");
 }
 
@@ -514,36 +494,22 @@ function codexAdapterInstructions(tenantId, agent) {
     ? `The catalog declares that this agent writes user or workspace data. Use this adapter only when the user explicitly selected this exact agent for the current request; that explicit selection is the required side-effect confirmation. If the agent was chosen automatically or the selection is ambiguous, do not run the orchestration and ask the user to select this exact agent explicitly.`
     : `The catalog declares that this agent is read-only; the orchestration omits confirmedSideEffects.`;
   const source = renderCodexAdapterOrchestration(tenantId, agent);
-  const callerSpawnGuidance = usesVerbatimRelay(agent)
-    ? adapterCallerSpawnGuidance("Codex")
-    : null;
-  const completionGuidance = usesVerbatimRelay(agent)
-    ? adapterHardCompletionGuidance()
-    : adapterSoftCompletionGuidance();
   return [
     `You are a thin transport adapter for the exact Impel native agent ${JSON.stringify(agent.agentId)} in tenant ${JSON.stringify(tenantId)}.`,
-    ...(callerSpawnGuidance ? [callerSpawnGuidance] : []),
+    `Callers must spawn this explicit custom Codex agent with fork_turns="none" and must relay your result verbatim; this is caller guidance and cannot enforce host spawn behavior.`,
     `Do not perform the assigned task yourself, do not delegate to any other agent, and do not independently synthesize or rewrite the result.`,
     `Confirm that the assigned request fits the cataloged capabilities ${JSON.stringify(agent.capabilities)} and none of the exclusions ${JSON.stringify(agent.exclusions)} before starting.${contextRequirement}`,
     sideEffectInstruction,
     `Invoke functions.exec exactly once for the orchestration below. Do not call the MCP tools directly or select a separate MCP call for any poll. Replace ${CODEX_TASK_PLACEHOLDER} with a JSON string literal for the complete assigned task. Replace ${CODEX_CONTEXT_PLACEHOLDER} with one JSON string literal containing all supplied caller context, or with null when no context was supplied; never use an object or array. Replace ${CODEX_CONTEXT_KEYS_PLACEHOLDER} with a JSON array naming the context fields present in that string, or [] when context is absent. Replace ${CODEX_IDEMPOTENCY_KEY_PLACEHOLDER} with one new opaque idempotency key for this logical invocation: choose it exactly once, reuse it unchanged for any retry of this invocation, and never reuse it for a separate request even when task and context are identical. Then pass the raw JavaScript without Markdown fences.`,
     `The JavaScript validates the exact tenant, agent binding, and catalog policy; passes the one stable logical-invocation idempotencyKey; starts exactly once; and polls deterministically with the compatible 20-second server wait until status is succeeded or failed. If functions.exec yields a running cell, use functions.wait with max_tokens 30000 only to resume that same orchestration; never start another orchestration or poll the MCP tool yourself.`,
-    completionGuidance,
+    `After the orchestration completes, return its single text output verbatim with no preface, rewriting, Markdown changes, or independent synthesis. A successful output is result.finalText exactly. A failure output preserves the durable runId, output, and error.`,
     "",
     source,
   ].join("\n\n");
 }
 
-function customAgentDescription(tenantId, agent) {
-  const sideEffectsLabel = agent.sideEffects === "writes" ? " (may write user or workspace data)" : " (read-only)";
-  return (usesVerbatimRelay(agent)
-    ? `${customAgentVerbatimDescriptionLead()}. Runs ${agent.title} for Impel tenant ${tenantId}${sideEffectsLabel}: ${agent.description}`
-    : `Explicitly runs ${agent.title} for Impel tenant ${tenantId}${sideEffectsLabel}: ${agent.description}`
-  ).slice(0, 900);
-}
-
 function renderClaudeAgent({ tenantId, agent, name, invocation }) {
-  const description = customAgentDescription(tenantId, agent);
+  const description = `Explicitly runs ${agent.title} for Impel tenant ${tenantId}${agent.sideEffects === "writes" ? " (may write user or workspace data)" : " (read-only)"}: ${agent.description}`.slice(0, 900);
   const lines = [
     "---",
     `name: ${JSON.stringify(name)}`,
@@ -568,7 +534,7 @@ function renderClaudeAgent({ tenantId, agent, name, invocation }) {
 }
 
 function renderCodexAgent({ tenantId, agent, name, invocation }) {
-  const description = customAgentDescription(tenantId, agent);
+  const description = `Explicit custom agent: callers must use fork_turns="none" and relay its result verbatim. Runs ${agent.title} for Impel tenant ${tenantId}${agent.sideEffects === "writes" ? " (may write user or workspace data)" : " (read-only)"}: ${agent.description}`.slice(0, 900);
   const envEntries = Object.entries(invocation.env || {})
     .map(([key, value]) => `${JSON.stringify(key)} = ${JSON.stringify(value)}`)
     .join(", ");
@@ -662,7 +628,7 @@ export function syncAgentProfile({ client, root, label, tenantId, agents, now =
   const prior = readManifest(manifestPath);
   const rendered = renderManagedAgents(client, tenantId, agents);
   const priorFiles = new Set(prior?.files || []);
-  const priorUsesDiscoveryRoot = [2, 3, 4, MANAGED_AGENT_MANIFEST_VERSION].includes(prior?.version);
+  const priorUsesDiscoveryRoot = [2, 3, MANAGED_AGENT_MANIFEST_VERSION].includes(prior?.version);
 
   // Native clients discover standalone definitions directly under `agents/`.
   // Preflight every destination before writing so an unmanaged file with the

package/src/apps.js

@@ -16,7 +16,6 @@ import { ensureClaudeSessionHooks, ensureCodexSessionHooks } from "./sessionHook
 import { ADHOC_IDENTITY, codesignIdentityArgs, desiredSigningMode, resolveSigningIdentity } from "./codesign.js";
 import { applyImpelClaudeSandbox } from "./claudeSandbox.js";
 import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
-import { IMPEL_CODEX_PARENT_DELEGATION_INSTRUCTIONS } from "./commands/launch.js";
 
 export const CLAUDE_CONFIG_ID = "1ced0000-0000-4000-8000-000000000001";
 const CHATGPT_CONFIG_START = `# >>> ${RUNTIME_BRAND.cli.command} app managed gateway >>>`;
@@ -267,8 +266,7 @@ export function managedAppIdentity(target, tenantId = null, tenantName = null) {
 // 26: remember the managed provider defaults and move legacy GPT-5.5 profiles
 // onto GPT-5.6 Sol so ChatGPT's compact Work picker does not fall back to its
 // unsupported-selection "Reset to default" treatment.
-// 27: add managed ChatGPT parent delegation instructions, including custom-agent verbatim relay opt-in.
-export const CURRENT_CONFIG_VERSION = 27;
+export const CURRENT_CONFIG_VERSION = 26;
 
 // Identifies the bundle-BUILDING logic — the asar patches, plist rewrites,
 // helper rebranding, and signing. A vendored bundle is rebuilt only when this
@@ -1271,9 +1269,6 @@ function writeChatGPTConfig(
     `model_catalog_json = ${tomlString(paths.chatgpt.catalog)}`,
     ...(selectedEffort ? [`model_reasoning_effort = ${tomlString(selectedEffort)}`] : []),
     ...(selectedTier ? [`service_tier = ${tomlString(selectedTier)}`] : []),
-    ...(RUNTIME_BRAND.features.agents
-      ? [`developer_instructions = ${tomlString(IMPEL_CODEX_PARENT_DELEGATION_INSTRUCTIONS)}`]
-      : []),
     "",
     // The built-in ChatGPT provider derives its inference endpoint from
     // chatgpt.com even when chatgpt_base_url points at the gateway. Keep the

package/src/commands/launch.js

@@ -14,7 +14,6 @@ import {
   resolveDefaultGateway,
   saveConfig,
 } from "../config.js";
-import { parentVerbatimRelayAppendix } from "../verbatimRelay.js";
 import { impelClaudeBaseUrl, impelCrossAppClaudeBaseUrl } from "../claudeSetup.js";
 import { withGitEnvironment } from "../skills.js";
 import { assertProviderScopes, ensureTenantSelection, tenantCredential } from "../tenants.js";
@@ -50,18 +49,10 @@ export {
 
 export const IMPEL_SPECIALIST_DELEGATION_INSTRUCTIONS = `You are running in an Impel tenant-scoped session. Before starting any non-trivial task, call the Impel MCP tool list_specialists. If exactly one available specialist clearly matches the user's request, its capabilities and its exclusions, delegate the complete request by calling start_specialist_run exactly once with a stable idempotency key, then call read_specialist_run until it reaches a terminal state. When the run succeeds, use the specialist's result as your response instead of redoing the work. If no specialist clearly matches, the tools are unavailable, or the run fails, continue normally yourself. Do not delegate trivial requests, do not call a specialist excluded from the request, and never invent a specialist result.`;
 
-export const IMPEL_CUSTOM_AGENT_VERBATIM_RELAY_APPENDIX = parentVerbatimRelayAppendix();
-
-export const IMPEL_CLAUDE_PARENT_DELEGATION_INSTRUCTIONS =
-  `${IMPEL_SPECIALIST_DELEGATION_INSTRUCTIONS} ${IMPEL_CUSTOM_AGENT_VERBATIM_RELAY_APPENDIX}`;
-
 export const IMPEL_CODEX_SPECIALIST_DELEGATION_INSTRUCTIONS =
   `${IMPEL_SPECIALIST_DELEGATION_INSTRUCTIONS} ` +
   `Codex can defer MCP tools behind tool_search. If an Impel specialist tool is not directly visible, call tool_search for its exact name before treating it as unavailable: impel_specialists-list_specialists for discovery, impel_specialists-start_specialist_run to delegate, and impel_specialists-read_specialist_run to poll the result. Use the returned tool for the same one-run delegation flow.`;
 
-export const IMPEL_CODEX_PARENT_DELEGATION_INSTRUCTIONS =
-  `${IMPEL_CODEX_SPECIALIST_DELEGATION_INSTRUCTIONS} ${IMPEL_CUSTOM_AGENT_VERBATIM_RELAY_APPENDIX}`;
-
 const IMPEL_CODEX_RUNTIME_OVERRIDES = [
   // Codex models may select code mode even when the standalone
   // `codex-code-mode-host` companion is not present in the vendor install.
@@ -73,14 +64,14 @@ const IMPEL_CODEX_RUNTIME_OVERRIDES = [
 export function impelLaunchArguments(tool, argv) {
   if (!RUNTIME_BRAND.features.agents) return [...argv];
   if (tool === "claude") {
-    return ["--append-system-prompt", IMPEL_CLAUDE_PARENT_DELEGATION_INSTRUCTIONS, ...argv];
+    return ["--append-system-prompt", IMPEL_SPECIALIST_DELEGATION_INSTRUCTIONS, ...argv];
   }
   if (tool === "codex") {
     // `-c` is a Codex global option, so it must precede subcommands such as
     // `exec`, `resume`, and `mcp`. JSON strings are valid TOML basic strings.
     return [
       "-c",
-      `developer_instructions=${JSON.stringify(IMPEL_CODEX_PARENT_DELEGATION_INSTRUCTIONS)}`,
+      `developer_instructions=${JSON.stringify(IMPEL_CODEX_SPECIALIST_DELEGATION_INSTRUCTIONS)}`,
       ...IMPEL_CODEX_RUNTIME_OVERRIDES.flatMap((override) => ["-c", override]),
       ...argv,
     ];

package/src/remote/transfer.js

@@ -40,6 +40,14 @@ function writePrivate(filePath, contents) {
   try { fs.chmodSync(filePath, 0o600); } catch { /* Best effort on Windows. */ }
 }
 
+function localTarEnvironment() {
+  // macOS libarchive serializes extended attributes into AppleDouble `._*`
+  // entries unless copyfile metadata is explicitly disabled. Those synthetic
+  // files make a clean transferred repository appear dirty on Linux even when
+  // tar's --no-xattrs option is present.
+  return { ...process.env, COPYFILE_DISABLE: "1" };
+}
+
 export function inspectRepository(requestedPath = process.cwd()) {
   const requested = path.resolve(requestedPath);
   const candidate = fs.realpathSync(requested);
@@ -98,7 +106,7 @@ export function createRepositoryTransfer(state, repository) {
     "--no-xattrs",
     "--null",
     "-T", paths.fileList,
-  ], { cwd: repository.root });
+  ], { cwd: repository.root, env: localTarEnvironment() });
   return paths;
 }
 
@@ -119,6 +127,18 @@ function joinNullBuffer(entries) {
   return Buffer.concat(entries.flatMap((entry) => [entry, Buffer.from([0])]));
 }
 
+function claudeProjectStorageKey(projectPath) {
+  return String(projectPath).replace(/[^A-Za-z0-9]/gu, "-");
+}
+
+export function checkpointRemoteRelativePath(provider, relativePath, remoteProjectPath) {
+  const normalized = String(relativePath).split(path.sep).join("/");
+  if (provider !== "claude") return normalized;
+  const segments = normalized.split("/");
+  if (segments[0] !== "projects" || segments.length < 3) return normalized;
+  return ["projects", claudeProjectStorageKey(remoteProjectPath), ...segments.slice(2)].join("/");
+}
+
 export async function waitForSsh(state, timeoutSeconds = 120) {
   const deadline = Date.now() + timeoutSeconds * 1000;
   let lastError = "SSH did not accept a connection";
@@ -274,15 +294,46 @@ export function transferSessionCheckpoint(state, { provider, sessionId, tenantId
   }
   const checkpointList = path.join(runPaths(state.runId).root, `checkpoint-${provider}.list`);
   const checkpointArchive = path.join(runPaths(state.runId).root, `checkpoint-${provider}.tar`);
+  const mappings = files.map((relative) => ({
+    source: relative.split(path.sep).join("/"),
+    destination: checkpointRemoteRelativePath(provider, relative, state.repository.remoteProjectPath),
+  }));
   writePrivate(checkpointList, Buffer.from(`${files.join("\0")}\0`, "utf8"));
   try {
     runCapture(process.env.IMPEL_REMOTE_TAR_BIN || "tar", [
       "-cf", checkpointArchive, "--no-xattrs", "--null", "-T", checkpointList,
-    ], { cwd: localRoot });
+    ], { cwd: localRoot, env: localTarEnvironment() });
     sshCapture(state, `mkdir -p ${remoteRoot}`);
     runInteractive(process.env.IMPEL_REMOTE_SSH_BIN || "ssh", sshArgs(state, `tar -xf - -C ${remoteRoot}`), {
       inputFile: checkpointArchive,
     });
+    if (provider === "claude") {
+      remoteNode(state, String.raw`
+const fs = require("node:fs");
+const path = require("node:path");
+const payload = JSON.parse(fs.readFileSync(0, "utf8"));
+const root = path.resolve(payload.root);
+for (const mapping of payload.mappings) {
+  const source = path.resolve(root, mapping.source);
+  const destination = path.resolve(root, mapping.destination);
+  if (!source.startsWith(root + path.sep) || !destination.startsWith(root + path.sep)) {
+    throw new Error("unsafe checkpoint path");
+  }
+  if (source === destination) continue;
+  if (!fs.statSync(source, { throwIfNoEntry: false })?.isFile()) {
+    throw new Error("checkpoint source is missing");
+  }
+  if (fs.existsSync(destination)) throw new Error("checkpoint destination already exists");
+  fs.mkdirSync(path.dirname(destination), { recursive: true, mode: 0o700 });
+  fs.renameSync(source, destination);
+  let emptyParent = path.dirname(source);
+  while (emptyParent !== root && emptyParent.startsWith(root + path.sep)) {
+    try { fs.rmdirSync(emptyParent); } catch { break; }
+    emptyParent = path.dirname(emptyParent);
+  }
+}
+`, { root: remoteRoot, mappings });
+    }
   } finally {
     fs.rmSync(checkpointList, { force: true });
     fs.rmSync(checkpointArchive, { force: true });

package/src/verbatimRelay.js

@@ -1,64 +0,0 @@
-export const VERBATIM_RELAY_OPT_IN_MARKER = "verbatimRelay enabled";
-
-export const VERBATIM_SPAWN_REQUIREMENT = 'fork_turns="none"';
-
-export const VERBATIM_FINAL_TEXT_CONSTRAINTS =
-  "no preface, rewriting, Markdown changes, or independent synthesis";
-
-export function usesVerbatimRelay(agent) {
-  return agent?.verbatimRelay === true;
-}
-
-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. " +
-    "Custom agents without that declaration keep the default delegation behavior."
-  );
-}
-
-export function customAgentVerbatimDescriptionLead() {
-  return (
-    `Explicit custom agent with ${VERBATIM_RELAY_OPT_IN_MARKER}: ` +
-    `callers must use ${VERBATIM_SPAWN_REQUIREMENT} and relay its result verbatim`
-  );
-}
-
-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."
-  );
-}
-
-export function adapterHardCompletionGuidance() {
-  return (
-    `After the orchestration completes, return its single text output verbatim with ${VERBATIM_FINAL_TEXT_CONSTRAINTS}. ` +
-    "A successful output is result.finalText exactly. A failure output preserves the durable runId, output, and error."
-  );
-}
-
-export function adapterSoftCompletionGuidance() {
-  return (
-    "After the orchestration completes, return its single text output as the answer. " +
-    "A successful output is result.finalText. A failure output preserves the durable runId, output, and error. " +
-    "Never invent or independently synthesize a replacement result."
-  );
-}
-
-export function claudeHardCompletionGuidance() {
-  return (
-    `When it succeeds, return result.finalText exactly with ${VERBATIM_FINAL_TEXT_CONSTRAINTS}. ` +
-    "When it fails, return the durable runId, preserved output, and error. " +
-    "Never invent or independently synthesize a replacement result."
-  );
-}
-
-export function claudeSoftCompletionGuidance() {
-  return (
-    "When it succeeds, return result.finalText faithfully as the answer. " +
-    "When it fails, return the durable runId, preserved output, and error. " +
-    "Never invent or independently synthesize a replacement result."
-  );
-}