poe-code 3.0.454 → 4.0.0

package/dist/index.js

@@ -22958,30 +22958,6 @@ async function isolatedConfigExists(fs31, configProbePath) {
     throw error3;
   }
 }
-async function applyIsolatedEnvRepairs(input) {
-  const repairs = input.isolated.repairs ?? [];
-  if (repairs.length === 0 || typeof input.fs.chmod !== "function") {
-    return;
-  }
-  const baseDir = input.env.resolveHomePath(".poe-code", input.providerName);
-  for (const repair of repairs) {
-    if (repair.kind !== "chmod") {
-      continue;
-    }
-    if (path17.isAbsolute(repair.relativePath)) {
-      continue;
-    }
-    const repairPath = path17.join(baseDir, repair.relativePath);
-    try {
-      await input.fs.chmod(repairPath, repair.mode);
-    } catch (error3) {
-      if (isNotFound(error3)) {
-        continue;
-      }
-      throw error3;
-    }
-  }
-}
 async function resolveCliSettings(cliSettings, env, activeProvider) {
   const result = { ...cliSettings.values };
   if (cliSettings.resolved) {
@@ -37836,13 +37812,13 @@ var init_acp_transport = __esm({
           cwd,
           env,
           firstRequestId,
-          spawn: spawn12 = spawnChildProcess3
+          spawn: spawn11 = spawnChildProcess3
         } = options;
         this.command = command;
         this.closed = new Promise((resolve14) => {
           this.resolveClosed = resolve14;
         });
-        this.child = spawn12(command, [...args], {
+        this.child = spawn11(command, [...args], {
           cwd,
           env,
           stdio: ["pipe", "pipe", "pipe"]
@@ -68352,11 +68328,6 @@ function createCheckRunner(resources) {
     });
   };
 }
-function listIsolatedServiceIds(container) {
-  return listServiceNames(
-    container.registry.list().filter((provider2) => Boolean(provider2.isolatedEnv))
-  );
-}
 function listServiceNames(services) {
   const names = [];
   const add = (value) => {
@@ -70685,535 +70656,6 @@ var init_providers = __esm({
   }
 });
 
-// src/utils/cli-settings-merge.ts
-function extractSettingsFromArgs(args) {
-  const settingsIdx = args.indexOf("--settings");
-  if (settingsIdx === -1 || settingsIdx >= args.length - 1) {
-    return { userSettings: null, argsWithoutSettings: args };
-  }
-  const settingsValue = args[settingsIdx + 1];
-  const argsWithoutSettings = [
-    ...args.slice(0, settingsIdx),
-    ...args.slice(settingsIdx + 2)
-  ];
-  if (settingsValue.startsWith("{")) {
-    return {
-      userSettings: JSON.parse(settingsValue),
-      argsWithoutSettings
-    };
-  }
-  return {
-    userSettings: null,
-    settingsFilePath: settingsValue,
-    argsWithoutSettings
-  };
-}
-function mergeCliSettings(userSettings, requiredSettings) {
-  if (!userSettings) {
-    return requiredSettings;
-  }
-  const merged = {
-    ...userSettings,
-    ...requiredSettings
-  };
-  if (userSettings.env || requiredSettings.env) {
-    merged.env = {
-      ...userSettings.env ?? {},
-      ...requiredSettings.env ?? {}
-    };
-  }
-  return merged;
-}
-function buildArgsWithMergedSettings(args, requiredSettings) {
-  const { userSettings, settingsFilePath, argsWithoutSettings } = extractSettingsFromArgs(args);
-  if (settingsFilePath) {
-    throw new Error(
-      `Cannot merge provider-required settings with --settings file path ${settingsFilePath}. Pass settings as inline JSON or remove --settings.`
-    );
-  }
-  const merged = mergeCliSettings(userSettings, requiredSettings);
-  return [...argsWithoutSettings, "--settings", JSON.stringify(merged)];
-}
-var init_cli_settings_merge = __esm({
-  "src/utils/cli-settings-merge.ts"() {
-    "use strict";
-  }
-});
-
-// src/cli/commands/configure-payload.ts
-async function createConfigurePayload(init) {
-  const { container, flags, options, context, adapter, logger: logger2, providerId } = init;
-  const payload = { env: context.env };
-  let provider2;
-  let activeProvider;
-  let resolvedModelChoices;
-  let hasResolvedModelChoices = false;
-  if (providerId) {
-    provider2 = container.providerRegistry.get(providerId);
-    if (!provider2) {
-      throw new Error(`Unknown provider "${providerId}".`);
-    }
-    const explicitShapeBaseUrls = parseProviderShapeBaseUrls(provider2, options.shapeBaseUrl ?? []);
-    const agent3 = resolveAgentDefinition(adapter.name) ?? { id: adapter.name };
-    const apiKey = flags.dryRun ? PREVIEW_API_KEY : providerId === POE_PROVIDER_ID ? await container.options.resolveApiKey({
-      value: options.apiKey,
-      envValue: provider2.auth.kind === "api-key" ? container.env.getVariable(provider2.auth.envVar) : void 0,
-      dryRun: false,
-      assumeYes: flags.assumeYes
-    }) : await container.providerRegistry.resolveCredential(
-      providerId,
-      { apiKey: options.apiKey },
-      { envVars: container.env.variables }
-    );
-    const explicitBaseUrl = await resolveConfigureBaseUrl({
-      options
-    });
-    activeProvider = await buildActiveProvider({
-      container,
-      provider: provider2,
-      agent: agent3,
-      credential: apiKey,
-      explicitBaseUrl,
-      explicitShapeBaseUrls,
-      readOnly: flags.dryRun
-    });
-    payload.provider = activeProvider;
-  }
-  const modelPrompt = adapter.configurePrompts?.model;
-  if (modelPrompt) {
-    const configModel = await resolveModel(
-      {
-        fs: container.fs,
-        filePath: container.env.configPath,
-        readOnly: flags.dryRun
-      },
-      adapter.name
-    );
-    const model = provider2?.modelInput?.kind === "freeform" && typeof modelPrompt.choices !== "function" ? await resolveFreeformProviderModel({
-      container,
-      flags,
-      options,
-      label: modelPrompt.label,
-      configModel,
-      provider: provider2,
-      logger: logger2
-    }) : await container.options.resolveModel({
-      value: options.model,
-      assumeDefault: flags.assumeYes,
-      defaultValue: configModel ?? modelPrompt.defaultValue,
-      choices: await resolveChoices(),
-      label: modelPrompt.label,
-      onResolve: (label, value) => logger2.resolved(label, value)
-    });
-    payload.model = model;
-  }
-  const reasoningPrompt = adapter.configurePrompts?.reasoningEffort;
-  if (reasoningPrompt) {
-    const reasoningEffort = await container.options.resolveReasoning({
-      value: options.reasoningEffort,
-      assumeDefault: flags.assumeYes,
-      defaultValue: reasoningPrompt.defaultValue,
-      label: reasoningPrompt.label
-    });
-    payload.reasoningEffort = reasoningEffort;
-  }
-  const extension = flags.dryRun ? void 0 : await adapter.extendConfigurePayload?.({
-    fs: container.fs,
-    env: context.env,
-    httpClient: container.httpClient,
-    logger: logger2,
-    payload,
-    prompts: container.prompts,
-    promptLibrary: container.promptLibrary,
-    assumeYes: flags.assumeYes,
-    commandOptions: options
-  });
-  if (extension) {
-    Object.assign(payload, extension);
-  }
-  return payload;
-  async function resolveChoices() {
-    const choices2 = modelPrompt?.choices;
-    if (!choices2) {
-      return void 0;
-    }
-    if (flags.dryRun && typeof choices2 === "function") {
-      return [{ title: modelPrompt.defaultValue, value: modelPrompt.defaultValue }];
-    }
-    if (typeof choices2 !== "function") {
-      return choices2;
-    }
-    if (hasResolvedModelChoices) {
-      return resolvedModelChoices;
-    }
-    hasResolvedModelChoices = true;
-    resolvedModelChoices = await resolveDynamicModelChoices({
-      choices: choices2,
-      activeProvider,
-      container,
-      adapter,
-      logger: logger2,
-      fallbackModel: modelPrompt.defaultValue
-    });
-    return resolvedModelChoices;
-  }
-}
-async function resolveDynamicModelChoices(input) {
-  try {
-    if (!input.activeProvider) {
-      throw new Error("active provider is unavailable");
-    }
-    return await input.choices({
-      httpClient: input.container.httpClient,
-      provider: input.activeProvider,
-      env: input.container.env
-    });
-  } catch (error3) {
-    input.logger.verbose(
-      `Failed to resolve model choices for ${input.adapter.name}: ${formatErrorMessage(
-        error3
-      )}. Using ${input.fallbackModel}.`
-    );
-    return [{ title: input.fallbackModel, value: input.fallbackModel }];
-  }
-}
-function formatErrorMessage(error3) {
-  if (error3 instanceof Error && error3.message.trim().length > 0) {
-    return error3.message;
-  }
-  return "unknown error";
-}
-async function resolveConfigureBaseUrl(input) {
-  return resolveNonEmpty(input.options.baseUrl);
-}
-async function resolveFreeformProviderModel(input) {
-  const explicitModel = resolveNonEmpty(input.options.model);
-  if (explicitModel !== void 0) {
-    input.logger.resolved(input.label, explicitModel);
-    return explicitModel;
-  }
-  const configuredModel = resolveNonEmpty(input.configModel ?? void 0);
-  if (configuredModel !== void 0) {
-    input.logger.resolved(input.label, configuredModel);
-    return configuredModel;
-  }
-  if (input.flags.assumeYes) {
-    throw new Error(
-      `Provider "${input.provider.id}" requires a model for "${input.label}". Pass --model.`
-    );
-  }
-  return await input.container.options.ensure({
-    descriptor: {
-      name: "model",
-      message: input.label,
-      type: "text"
-    }
-  });
-}
-var PREVIEW_API_KEY;
-var init_configure_payload = __esm({
-  "src/cli/commands/configure-payload.ts"() {
-    "use strict";
-    init_src9();
-    init_shared();
-    init_src8();
-    PREVIEW_API_KEY = "<redacted>";
-  }
-});
-
-// src/services/mutation-events.ts
-function createMutationReporter(logger2) {
-  return {
-    onComplete(details, outcome) {
-      logger2.verbose(formatMutationMessage(details, outcome));
-    },
-    onError(details, error3) {
-      logger2.error(
-        `${details.label} failed: ${describeError(error3)}`
-      );
-    }
-  };
-}
-function combineMutationObservers(...observers) {
-  const active = observers.filter(
-    (observer) => observer != null
-  );
-  if (active.length === 0) {
-    return void 0;
-  }
-  return {
-    onStart(details) {
-      for (const observer of active) {
-        observer.onStart?.(details);
-      }
-    },
-    onComplete(details, outcome) {
-      for (const observer of active) {
-        observer.onComplete?.(details, outcome);
-      }
-    },
-    onError(details, error3) {
-      for (const observer of active) {
-        observer.onError?.(details, error3);
-      }
-    }
-  };
-}
-function formatMutationMessage(details, outcome) {
-  const status = describeOutcome(outcome);
-  return `${details.label}: ${status}`;
-}
-function describeOutcome(outcome) {
-  if (outcome.changed) {
-    return outcome.detail ?? outcome.effect;
-  }
-  if (outcome.detail && outcome.detail !== "noop") {
-    return outcome.detail;
-  }
-  return "no changes";
-}
-function describeError(error3) {
-  if (error3 instanceof Error) {
-    return error3.message;
-  }
-  return String(error3 ?? "Unknown error");
-}
-var init_mutation_events = __esm({
-  "src/services/mutation-events.ts"() {
-    "use strict";
-  }
-});
-
-// src/cli/commands/ensure-isolated-config.ts
-var ensure_isolated_config_exports = {};
-__export(ensure_isolated_config_exports, {
-  ensureIsolatedConfigForService: () => ensureIsolatedConfigForService
-});
-async function ensureIsolatedConfigForService(input) {
-  const { container, adapter } = input;
-  const canonicalService = adapter.name;
-  const isolated = adapter.isolatedEnv;
-  if (!isolated) {
-    return;
-  }
-  const flags = input.flags;
-  const shouldRefresh = input.refresh === true;
-  const resources = createExecutionResources(
-    container,
-    flags,
-    `isolated:${canonicalService}`
-  );
-  const providerContext = buildProviderContext(container, adapter, resources);
-  if (isolated.requiresConfig === false) {
-    return;
-  }
-  const activeProvider = await resolveActiveProviderForService(
-    container,
-    canonicalService,
-    { readOnly: flags.dryRun }
-  );
-  const details = await resolveIsolatedEnvDetails(
-    container.env,
-    isolated,
-    adapter.name,
-    activeProvider
-  );
-  const hasConfig = await isolatedConfigExists(
-    container.fs,
-    details.configProbePath
-  );
-  if (hasConfig && !shouldRefresh) {
-    return;
-  }
-  const providerId = await resolveIsolatedServiceProvider(container, canonicalService, {
-    readOnly: flags.dryRun
-  });
-  if (!providerId) {
-    return;
-  }
-  const configuredServices = await loadConfiguredServices({
-    fs: container.fs,
-    filePath: container.env.configPath,
-    projectFilePath: container.env.projectConfigPath,
-    readOnly: flags.dryRun
-  });
-  const metadata = configuredServices[canonicalService];
-  const payload = await createConfigurePayload({
-    container,
-    flags: { ...flags, assumeYes: true },
-    options: {
-      model: metadata?.model,
-      reasoningEffort: metadata?.reasoningEffort,
-      baseUrl: metadata?.baseUrl,
-      shapeBaseUrl: metadata?.shapeBaseUrl,
-      ...input.options
-    },
-    context: providerContext,
-    adapter,
-    logger: resources.logger,
-    providerId
-  });
-  await container.registry.invoke(canonicalService, "configure", async (entry) => {
-    if (!entry.configure) {
-      throw new Error(`Agent "${canonicalService}" does not support configure.`);
-    }
-    const mutationLogger = createMutationReporter(resources.logger);
-    await applyIsolatedConfiguration({
-      adapter: entry,
-      providerContext,
-      payload,
-      isolated,
-      providerName: adapter.name,
-      observers: mutationLogger
-    });
-  });
-  if (!flags.dryRun) {
-    const refreshed = await isolatedConfigExists(
-      container.fs,
-      details.configProbePath
-    );
-    if (!refreshed) {
-      throw new Error(
-        `${adapter.label} isolated configuration did not create ${details.configProbePath}.`
-      );
-    }
-  }
-}
-async function resolveIsolatedServiceProvider(container, serviceName, options = {}) {
-  const configuredServices = await loadConfiguredServices({
-    fs: container.fs,
-    filePath: container.env.configPath,
-    projectFilePath: container.env.projectConfigPath,
-    readOnly: options.readOnly
-  });
-  const metadata = configuredServices[serviceName];
-  if (metadata?.provider) {
-    return metadata.provider;
-  }
-  const agent3 = resolveAgentDefinition(serviceName);
-  if (!agent3) {
-    return void 0;
-  }
-  const providers = container.providerRegistry.forAgent(agent3);
-  const loggedIn = [];
-  for (const provider2 of providers) {
-    if (await isProviderAvailable(container, provider2.id, options)) {
-      loggedIn.push(provider2.id);
-    }
-  }
-  if (loggedIn.length === 1) {
-    return loggedIn[0];
-  }
-  if (providers.length === 1) {
-    return providers[0].id;
-  }
-  return providers[0]?.id;
-}
-async function isProviderAvailable(container, providerId, options) {
-  try {
-    return await container.providerRegistry.isLoggedIn(providerId, options);
-  } catch {
-    return false;
-  }
-}
-var init_ensure_isolated_config = __esm({
-  "src/cli/commands/ensure-isolated-config.ts"() {
-    "use strict";
-    init_shared();
-    init_isolated_env();
-    init_configure_payload();
-    init_mutation_events();
-    init_config5();
-  }
-});
-
-// src/cli/poe-code-command-runner.ts
-function createPoeCodeCommandRunner(input) {
-  return async (command, args, options) => {
-    const container = input.getContainer();
-    if (command !== "poe-code" || args.length === 0) {
-      return input.baseRunner(command, args, options);
-    }
-    if (args[0] !== "wrap") {
-      return input.baseRunner(command, args, options);
-    }
-    const service = args[1];
-    if (typeof service !== "string" || service.trim() === "") {
-      return input.baseRunner(command, args, options);
-    }
-    const adapter = container.registry.get(service);
-    if (!adapter?.isolatedEnv) {
-      return input.baseRunner(command, args, options);
-    }
-    const activeProvider = await resolveActiveProviderForService(container, adapter.name);
-    const details = await resolveIsolatedEnvDetails(
-      container.env,
-      adapter.isolatedEnv,
-      adapter.name,
-      activeProvider
-    );
-    const runtimeEnv = adapter.runtimeEnv ? await resolveProviderRuntimeEnv(
-      container.env,
-      adapter.runtimeEnv,
-      adapter.name,
-      activeProvider
-    ) : {};
-    if (adapter.isolatedEnv.requiresConfig !== false) {
-      const hasConfig = await isolatedConfigExists(container.fs, details.configProbePath);
-      if (!hasConfig) {
-        await ensureIsolatedConfigForService({
-          container,
-          adapter,
-          service,
-          flags: { dryRun: false, assumeYes: true, verbose: false },
-          refresh: true
-        });
-      }
-    }
-    await applyIsolatedEnvRepairs({
-      fs: container.fs,
-      env: container.env,
-      providerName: adapter.name,
-      isolated: adapter.isolatedEnv
-    });
-    let forwarded = args.slice(2);
-    if (forwarded[0] === "--") {
-      forwarded = forwarded.slice(1);
-    }
-    if (adapter.isolatedEnv.cliSettings) {
-      const resolvedSettings = await resolveCliSettings(
-        adapter.isolatedEnv.cliSettings,
-        container.env,
-        activeProvider
-      );
-      forwarded = buildArgsWithMergedSettings(forwarded, resolvedSettings);
-    }
-    const mergedEnv = {
-      ...activeProvider?.extraEnv ?? {},
-      ...details.env,
-      ...runtimeEnv,
-      ...options?.env ?? {}
-    };
-    const runOptions = { env: mergedEnv };
-    if (options?.cwd) {
-      runOptions.cwd = options.cwd;
-    }
-    if (options?.stdin != null) {
-      runOptions.stdin = options.stdin;
-    }
-    return input.baseRunner(details.agentBinary, forwarded, runOptions);
-  };
-}
-var init_poe_code_command_runner = __esm({
-  "src/cli/poe-code-command-runner.ts"() {
-    "use strict";
-    init_isolated_env();
-    init_cli_settings_merge();
-    init_ensure_isolated_config();
-    init_shared();
-  }
-});
-
 // src/cli/provider-auth-storage.ts
 function providerCredentialFileName(provider2) {
   return `credentials.${credentialFileSegment(requireApiKeyAuth2(provider2).storageKey)}.enc`;
@@ -71390,12 +70832,6 @@ function createSdkContainer(options) {
   for (const adapter of providers) {
     registry.register(adapter);
   }
-  const baseRunner = runCommand;
-  let container = null;
-  const wrappedRunner = createPoeCodeCommandRunner({
-    getContainer: () => container,
-    baseRunner
-  });
   const httpClient = async (url, init) => {
     const response = await globalThis.fetch(url, init);
     return {
@@ -71404,7 +70840,7 @@ function createSdkContainer(options) {
       json: () => response.json()
     };
   };
-  container = {
+  const container = {
     env: environment2,
     fs: asyncFs,
     prompts: noopPrompts,
@@ -71416,7 +70852,7 @@ function createSdkContainer(options) {
     registry,
     providerRegistry,
     httpClient,
-    commandRunner: wrappedRunner,
+    commandRunner: runCommand,
     providers,
     dependencies: {
       fs: asyncFs,
@@ -71449,7 +70885,6 @@ var init_container = __esm({
     init_src17();
     await init_providers();
     init_src8();
-    init_poe_code_command_runner();
     init_src3();
     init_provider_auth_storage();
   }
@@ -71751,8 +71186,8 @@ function createNodeWorktreeDeps2() {
   };
 }
 async function defaultSpawnAgent(service, options) {
-  const { spawn: spawn12 } = await init_spawn4().then(() => spawn_exports);
-  return await spawn12(service, options).result;
+  const { spawn: spawn11 } = await init_spawn4().then(() => spawn_exports);
+  return await spawn11(service, options).result;
 }
 var execShell2;
 var init_worktree = __esm({
@@ -85461,7 +84896,7 @@ async function ingestGaslight(options) {
   const cwd = options.cwd ?? process.cwd();
   const homeDir = options.homeDir ?? os18.homedir();
   const fs31 = options.fs ?? nodeFs15;
-  const spawn12 = options.spawn ?? spawn5;
+  const spawn11 = options.spawn ?? spawn5;
   const collectHumanPrompts2 = options.collectHumanPrompts ?? collectHumanPromptsWithStats;
   const analysisAgent = requireNonEmptyString3(options.analysisAgent, "analysisAgent");
   const model = resolveOptionalNonEmptyString(options.model, "model");
@@ -85495,7 +84930,7 @@ async function ingestGaslight(options) {
       agent: analysisAgent,
       dataPath: dataPath.absolutePath
     });
-    const result = await spawn12(analysisAgent, {
+    const result = await spawn11(analysisAgent, {
       prompt: buildAnalysisPrompt(dataPath.absolutePath),
       cwd,
       mode: "read",
@@ -85634,7 +85069,7 @@ async function runGaslight(options) {
   const cwd = options.cwd ?? process.cwd();
   const homeDir = options.homeDir ?? os19.homedir();
   const fs31 = options.fs ?? nodeFs16;
-  const spawn12 = options.spawn ?? spawn5;
+  const spawn11 = options.spawn ?? spawn5;
   const agent3 = requireNonEmptyString4(options.agent, "agent");
   const model = resolveModel2(options.model);
   validateInlineConfig(options.prompt, options.followups);
@@ -85663,7 +85098,7 @@ async function runGaslight(options) {
         planIndex: planIndex + 1,
         totalPlans: planPaths.length
       });
-      const result = await spawn12(agent3, {
+      const result = await spawn11(agent3, {
         prompt,
         cwd,
         mode: options.mode ?? "auto",
@@ -100506,12 +99941,7 @@ function createCliContainer(dependencies) {
   for (const adapter of providers) {
     registry.register(adapter);
   }
-  let container = null;
-  const wrappedRunner = createPoeCodeCommandRunner({
-    getContainer: () => container,
-    baseRunner: commandRunner
-  });
-  container = {
+  return {
     env: environment2,
     fs: dependencies.fs,
     prompts: dependencies.prompts,
@@ -100523,7 +99953,7 @@ function createCliContainer(dependencies) {
     registry,
     providerRegistry,
     httpClient,
-    commandRunner: wrappedRunner,
+    commandRunner,
     providers,
     dependencies,
     readApiKey,
@@ -100531,7 +99961,6 @@ function createCliContainer(dependencies) {
     deleteApiKey,
     createPreviewProviderStore
   };
-  return container;
 }
 var init_container2 = __esm({
   async "src/cli/container.ts"() {
@@ -100549,13 +99978,256 @@ var init_container2 = __esm({
     init_src2();
     await init_providers();
     init_src8();
-    init_poe_code_command_runner();
     init_errors();
     init_oauth_login();
     init_provider_auth_storage();
   }
 });
 
+// src/services/mutation-events.ts
+function createMutationReporter(logger2) {
+  return {
+    onComplete(details, outcome) {
+      logger2.verbose(formatMutationMessage(details, outcome));
+    },
+    onError(details, error3) {
+      logger2.error(
+        `${details.label} failed: ${describeError(error3)}`
+      );
+    }
+  };
+}
+function combineMutationObservers(...observers) {
+  const active = observers.filter(
+    (observer) => observer != null
+  );
+  if (active.length === 0) {
+    return void 0;
+  }
+  return {
+    onStart(details) {
+      for (const observer of active) {
+        observer.onStart?.(details);
+      }
+    },
+    onComplete(details, outcome) {
+      for (const observer of active) {
+        observer.onComplete?.(details, outcome);
+      }
+    },
+    onError(details, error3) {
+      for (const observer of active) {
+        observer.onError?.(details, error3);
+      }
+    }
+  };
+}
+function formatMutationMessage(details, outcome) {
+  const status = describeOutcome(outcome);
+  return `${details.label}: ${status}`;
+}
+function describeOutcome(outcome) {
+  if (outcome.changed) {
+    return outcome.detail ?? outcome.effect;
+  }
+  if (outcome.detail && outcome.detail !== "noop") {
+    return outcome.detail;
+  }
+  return "no changes";
+}
+function describeError(error3) {
+  if (error3 instanceof Error) {
+    return error3.message;
+  }
+  return String(error3 ?? "Unknown error");
+}
+var init_mutation_events = __esm({
+  "src/services/mutation-events.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/commands/configure-payload.ts
+async function createConfigurePayload(init) {
+  const { container, flags, options, context, adapter, logger: logger2, providerId } = init;
+  const payload = { env: context.env };
+  let provider2;
+  let activeProvider;
+  let resolvedModelChoices;
+  let hasResolvedModelChoices = false;
+  if (providerId) {
+    provider2 = container.providerRegistry.get(providerId);
+    if (!provider2) {
+      throw new Error(`Unknown provider "${providerId}".`);
+    }
+    const explicitShapeBaseUrls = parseProviderShapeBaseUrls(provider2, options.shapeBaseUrl ?? []);
+    const agent3 = resolveAgentDefinition(adapter.name) ?? { id: adapter.name };
+    const apiKey = flags.dryRun ? PREVIEW_API_KEY : providerId === POE_PROVIDER_ID ? await container.options.resolveApiKey({
+      value: options.apiKey,
+      envValue: provider2.auth.kind === "api-key" ? container.env.getVariable(provider2.auth.envVar) : void 0,
+      dryRun: false,
+      assumeYes: flags.assumeYes
+    }) : await container.providerRegistry.resolveCredential(
+      providerId,
+      { apiKey: options.apiKey },
+      { envVars: container.env.variables }
+    );
+    const explicitBaseUrl = await resolveConfigureBaseUrl({
+      options
+    });
+    activeProvider = await buildActiveProvider({
+      container,
+      provider: provider2,
+      agent: agent3,
+      credential: apiKey,
+      explicitBaseUrl,
+      explicitShapeBaseUrls,
+      readOnly: flags.dryRun
+    });
+    payload.provider = activeProvider;
+  }
+  const modelPrompt = adapter.configurePrompts?.model;
+  if (modelPrompt) {
+    const configModel = await resolveModel(
+      {
+        fs: container.fs,
+        filePath: container.env.configPath,
+        readOnly: flags.dryRun
+      },
+      adapter.name
+    );
+    const model = provider2?.modelInput?.kind === "freeform" && typeof modelPrompt.choices !== "function" ? await resolveFreeformProviderModel({
+      container,
+      flags,
+      options,
+      label: modelPrompt.label,
+      configModel,
+      provider: provider2,
+      logger: logger2
+    }) : await container.options.resolveModel({
+      value: options.model,
+      assumeDefault: flags.assumeYes,
+      defaultValue: configModel ?? modelPrompt.defaultValue,
+      choices: await resolveChoices(),
+      label: modelPrompt.label,
+      onResolve: (label, value) => logger2.resolved(label, value)
+    });
+    payload.model = model;
+  }
+  const reasoningPrompt = adapter.configurePrompts?.reasoningEffort;
+  if (reasoningPrompt) {
+    const reasoningEffort = await container.options.resolveReasoning({
+      value: options.reasoningEffort,
+      assumeDefault: flags.assumeYes,
+      defaultValue: reasoningPrompt.defaultValue,
+      label: reasoningPrompt.label
+    });
+    payload.reasoningEffort = reasoningEffort;
+  }
+  const extension = flags.dryRun ? void 0 : await adapter.extendConfigurePayload?.({
+    fs: container.fs,
+    env: context.env,
+    httpClient: container.httpClient,
+    logger: logger2,
+    payload,
+    prompts: container.prompts,
+    promptLibrary: container.promptLibrary,
+    assumeYes: flags.assumeYes,
+    commandOptions: options
+  });
+  if (extension) {
+    Object.assign(payload, extension);
+  }
+  return payload;
+  async function resolveChoices() {
+    const choices2 = modelPrompt?.choices;
+    if (!choices2) {
+      return void 0;
+    }
+    if (flags.dryRun && typeof choices2 === "function") {
+      return [{ title: modelPrompt.defaultValue, value: modelPrompt.defaultValue }];
+    }
+    if (typeof choices2 !== "function") {
+      return choices2;
+    }
+    if (hasResolvedModelChoices) {
+      return resolvedModelChoices;
+    }
+    hasResolvedModelChoices = true;
+    resolvedModelChoices = await resolveDynamicModelChoices({
+      choices: choices2,
+      activeProvider,
+      container,
+      adapter,
+      logger: logger2,
+      fallbackModel: modelPrompt.defaultValue
+    });
+    return resolvedModelChoices;
+  }
+}
+async function resolveDynamicModelChoices(input) {
+  try {
+    if (!input.activeProvider) {
+      throw new Error("active provider is unavailable");
+    }
+    return await input.choices({
+      httpClient: input.container.httpClient,
+      provider: input.activeProvider,
+      env: input.container.env
+    });
+  } catch (error3) {
+    input.logger.verbose(
+      `Failed to resolve model choices for ${input.adapter.name}: ${formatErrorMessage(
+        error3
+      )}. Using ${input.fallbackModel}.`
+    );
+    return [{ title: input.fallbackModel, value: input.fallbackModel }];
+  }
+}
+function formatErrorMessage(error3) {
+  if (error3 instanceof Error && error3.message.trim().length > 0) {
+    return error3.message;
+  }
+  return "unknown error";
+}
+async function resolveConfigureBaseUrl(input) {
+  return resolveNonEmpty(input.options.baseUrl);
+}
+async function resolveFreeformProviderModel(input) {
+  const explicitModel = resolveNonEmpty(input.options.model);
+  if (explicitModel !== void 0) {
+    input.logger.resolved(input.label, explicitModel);
+    return explicitModel;
+  }
+  const configuredModel = resolveNonEmpty(input.configModel ?? void 0);
+  if (configuredModel !== void 0) {
+    input.logger.resolved(input.label, configuredModel);
+    return configuredModel;
+  }
+  if (input.flags.assumeYes) {
+    throw new Error(
+      `Provider "${input.provider.id}" requires a model for "${input.label}". Pass --model.`
+    );
+  }
+  return await input.container.options.ensure({
+    descriptor: {
+      name: "model",
+      message: input.label,
+      type: "text"
+    }
+  });
+}
+var PREVIEW_API_KEY;
+var init_configure_payload = __esm({
+  "src/cli/commands/configure-payload.ts"() {
+    "use strict";
+    init_src9();
+    init_shared();
+    init_src8();
+    PREVIEW_API_KEY = "<redacted>";
+  }
+});
+
 // src/cli/commands/configure.ts
 import path150 from "node:path";
 import { randomUUID as randomUUID41 } from "node:crypto";
@@ -102106,142 +101778,6 @@ var init_spawn_poe_agent = __esm({
   }
 });
 
-// src/cli/isolated-env-runner.ts
-import { spawn as spawn11 } from "node:child_process";
-async function isolatedEnvRunner(input) {
-  const details = await resolveIsolatedEnvDetails(
-    input.env,
-    input.isolated,
-    input.providerName,
-    input.activeProvider
-  );
-  let args = input.argv.slice(2);
-  if (input.isolated.requiresConfig !== false) {
-    const hasConfig = await configExists(input.fs, details.configProbePath);
-    if (!hasConfig) {
-      throw new Error(
-        `${input.providerName} is not configured. Run 'poe-code login' or 'poe-code configure ${input.providerName}'.`
-      );
-    }
-  }
-  if (input.isolated.cliSettings) {
-    const resolvedSettings = await resolveCliSettings(
-      input.isolated.cliSettings,
-      input.env,
-      input.activeProvider
-    );
-    args = buildArgsWithMergedSettings(args, resolvedSettings);
-  }
-  const child = spawn11(details.agentBinary, args, {
-    stdio: "inherit",
-    env: {
-      ...process.env,
-      ...details.env
-    }
-  });
-  return await new Promise((_, reject) => {
-    child.on("error", (error3) => {
-      reject(error3);
-    });
-    child.on("close", (code, signal) => {
-      process.exit(code ?? (signal === null ? 0 : 1));
-    });
-  });
-}
-async function configExists(fs31, filePath) {
-  if (!fs31) {
-    return true;
-  }
-  try {
-    await fs31.stat(filePath);
-    return true;
-  } catch (error3) {
-    if (isNotFound(error3)) {
-      return false;
-    }
-    throw error3;
-  }
-}
-var init_isolated_env_runner = __esm({
-  "src/cli/isolated-env-runner.ts"() {
-    "use strict";
-    init_src6();
-    init_isolated_env();
-    init_cli_settings_merge();
-  }
-});
-
-// src/cli/commands/wrap.ts
-function registerWrapCommand(program, container) {
-  const serviceNames = listIsolatedServiceIds(container);
-  const serviceDescription = `Agent to wrap${formatServiceList(serviceNames)}`;
-  return program.command("wrap").alias("w").description("Run an agent CLI with Poe isolated configuration.").allowUnknownOption(true).allowExcessArguments(true).argument("<agent>", serviceDescription).argument("[agentArgs...]", "Arguments forwarded to the agent").action(async (service, agentArgs = []) => {
-    const requestedService = service;
-    const flags = resolveCommandFlags(program);
-    const adapter = resolveServiceAdapter(container, requestedService);
-    const canonicalService = adapter.name;
-    const isolated = adapter.isolatedEnv;
-    if (!isolated) {
-      throw new Error(
-        `Agent "${requestedService}" does not support isolated configuration wrappers.`
-      );
-    }
-    const argv = process.argv;
-    const wrapIndex = argv.indexOf("wrap");
-    const serviceIndex = wrapIndex >= 0 && argv[wrapIndex + 1] === requestedService ? wrapIndex + 1 : argv.indexOf(requestedService);
-    const startIndex = serviceIndex >= 0 ? serviceIndex + 1 : argv.length;
-    let forwarded = argv.slice(startIndex);
-    if (forwarded[0] === "--") {
-      forwarded = forwarded.slice(1);
-    }
-    if (forwarded.length === 0) {
-      forwarded = agentArgs;
-    }
-    if (isolated.requiresConfig !== false) {
-      await ensureIsolatedConfigForService({
-        container,
-        adapter,
-        service: canonicalService,
-        flags,
-        refresh: false
-      });
-    }
-    if (flags.dryRun) {
-      const resources = createExecutionResources(container, flags, `wrap:${canonicalService}`);
-      resources.logger.dryRun(
-        `Dry run: would run ${[isolated.agentBinary, ...forwarded].join(" ")}.`
-      );
-      resources.context.finalize();
-      return;
-    }
-    const activeProvider = await resolveActiveProviderForService(container, canonicalService);
-    await applyIsolatedEnvRepairs({
-      fs: container.fs,
-      env: container.env,
-      providerName: adapter.name,
-      isolated
-    });
-    await isolatedEnvRunner({
-      env: container.env,
-      fs: container.fs,
-      readApiKey: container.readApiKey,
-      providerName: adapter.name,
-      isolated,
-      activeProvider,
-      argv: ["node", "poe-code", ...forwarded]
-    });
-  });
-}
-var init_wrap2 = __esm({
-  "src/cli/commands/wrap.ts"() {
-    "use strict";
-    init_shared();
-    init_isolated_env_runner();
-    init_ensure_isolated_config();
-    init_isolated_env();
-  }
-});
-
 // src/cli/commands/login.ts
 function registerLoginCommand(program, container) {
   program.command("login").description("Store a Poe API key for reuse across commands.").option("--api-key <key>", "Poe API key").action(async (options) => {
@@ -103643,6 +103179,204 @@ var init_update2 = __esm({
   }
 });
 
+// src/utils/cli-settings-merge.ts
+function extractSettingsFromArgs(args) {
+  const settingsIdx = args.indexOf("--settings");
+  if (settingsIdx === -1 || settingsIdx >= args.length - 1) {
+    return { userSettings: null, argsWithoutSettings: args };
+  }
+  const settingsValue = args[settingsIdx + 1];
+  const argsWithoutSettings = [
+    ...args.slice(0, settingsIdx),
+    ...args.slice(settingsIdx + 2)
+  ];
+  if (settingsValue.startsWith("{")) {
+    return {
+      userSettings: JSON.parse(settingsValue),
+      argsWithoutSettings
+    };
+  }
+  return {
+    userSettings: null,
+    settingsFilePath: settingsValue,
+    argsWithoutSettings
+  };
+}
+function mergeCliSettings(userSettings, requiredSettings) {
+  if (!userSettings) {
+    return requiredSettings;
+  }
+  const merged = {
+    ...userSettings,
+    ...requiredSettings
+  };
+  if (userSettings.env || requiredSettings.env) {
+    merged.env = {
+      ...userSettings.env ?? {},
+      ...requiredSettings.env ?? {}
+    };
+  }
+  return merged;
+}
+function buildArgsWithMergedSettings(args, requiredSettings) {
+  const { userSettings, settingsFilePath, argsWithoutSettings } = extractSettingsFromArgs(args);
+  if (settingsFilePath) {
+    throw new Error(
+      `Cannot merge provider-required settings with --settings file path ${settingsFilePath}. Pass settings as inline JSON or remove --settings.`
+    );
+  }
+  const merged = mergeCliSettings(userSettings, requiredSettings);
+  return [...argsWithoutSettings, "--settings", JSON.stringify(merged)];
+}
+var init_cli_settings_merge = __esm({
+  "src/utils/cli-settings-merge.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/commands/ensure-isolated-config.ts
+var ensure_isolated_config_exports = {};
+__export(ensure_isolated_config_exports, {
+  ensureIsolatedConfigForService: () => ensureIsolatedConfigForService
+});
+async function ensureIsolatedConfigForService(input) {
+  const { container, adapter } = input;
+  const canonicalService = adapter.name;
+  const isolated = adapter.isolatedEnv;
+  if (!isolated) {
+    return;
+  }
+  const flags = input.flags;
+  const shouldRefresh = input.refresh === true;
+  const resources = createExecutionResources(
+    container,
+    flags,
+    `isolated:${canonicalService}`
+  );
+  const providerContext = buildProviderContext(container, adapter, resources);
+  if (isolated.requiresConfig === false) {
+    return;
+  }
+  const activeProvider = await resolveActiveProviderForService(
+    container,
+    canonicalService,
+    { readOnly: flags.dryRun }
+  );
+  const details = await resolveIsolatedEnvDetails(
+    container.env,
+    isolated,
+    adapter.name,
+    activeProvider
+  );
+  const hasConfig = await isolatedConfigExists(
+    container.fs,
+    details.configProbePath
+  );
+  if (hasConfig && !shouldRefresh) {
+    return;
+  }
+  const providerId = await resolveIsolatedServiceProvider(container, canonicalService, {
+    readOnly: flags.dryRun
+  });
+  if (!providerId) {
+    return;
+  }
+  const configuredServices = await loadConfiguredServices({
+    fs: container.fs,
+    filePath: container.env.configPath,
+    projectFilePath: container.env.projectConfigPath,
+    readOnly: flags.dryRun
+  });
+  const metadata = configuredServices[canonicalService];
+  const payload = await createConfigurePayload({
+    container,
+    flags: { ...flags, assumeYes: true },
+    options: {
+      model: metadata?.model,
+      reasoningEffort: metadata?.reasoningEffort,
+      baseUrl: metadata?.baseUrl,
+      shapeBaseUrl: metadata?.shapeBaseUrl,
+      ...input.options
+    },
+    context: providerContext,
+    adapter,
+    logger: resources.logger,
+    providerId
+  });
+  await container.registry.invoke(canonicalService, "configure", async (entry) => {
+    if (!entry.configure) {
+      throw new Error(`Agent "${canonicalService}" does not support configure.`);
+    }
+    const mutationLogger = createMutationReporter(resources.logger);
+    await applyIsolatedConfiguration({
+      adapter: entry,
+      providerContext,
+      payload,
+      isolated,
+      providerName: adapter.name,
+      observers: mutationLogger
+    });
+  });
+  if (!flags.dryRun) {
+    const refreshed = await isolatedConfigExists(
+      container.fs,
+      details.configProbePath
+    );
+    if (!refreshed) {
+      throw new Error(
+        `${adapter.label} isolated configuration did not create ${details.configProbePath}.`
+      );
+    }
+  }
+}
+async function resolveIsolatedServiceProvider(container, serviceName, options = {}) {
+  const configuredServices = await loadConfiguredServices({
+    fs: container.fs,
+    filePath: container.env.configPath,
+    projectFilePath: container.env.projectConfigPath,
+    readOnly: options.readOnly
+  });
+  const metadata = configuredServices[serviceName];
+  if (metadata?.provider) {
+    return metadata.provider;
+  }
+  const agent3 = resolveAgentDefinition(serviceName);
+  if (!agent3) {
+    return void 0;
+  }
+  const providers = container.providerRegistry.forAgent(agent3);
+  const loggedIn = [];
+  for (const provider2 of providers) {
+    if (await isProviderAvailable(container, provider2.id, options)) {
+      loggedIn.push(provider2.id);
+    }
+  }
+  if (loggedIn.length === 1) {
+    return loggedIn[0];
+  }
+  if (providers.length === 1) {
+    return providers[0].id;
+  }
+  return providers[0]?.id;
+}
+async function isProviderAvailable(container, providerId, options) {
+  try {
+    return await container.providerRegistry.isLoggedIn(providerId, options);
+  } catch {
+    return false;
+  }
+}
+var init_ensure_isolated_config = __esm({
+  "src/cli/commands/ensure-isolated-config.ts"() {
+    "use strict";
+    init_shared();
+    init_isolated_env();
+    init_configure_payload();
+    init_mutation_events();
+    init_config5();
+  }
+});
+
 // src/cli/commands/test.ts
 import { Option as Option5 } from "commander";
 function registerTestCommand(program, container) {
@@ -103732,12 +103466,43 @@ async function executeTest(program, container, service, options = {}) {
         runCheck: async (check) => {
           await check.run({
             isDryRun: providerContext.logger.context.dryRun,
-            runCommand: (command, args) => resources.context.runCommand("poe-code", [
-              "wrap",
-              canonicalService,
-              "--",
-              ...args
-            ]),
+            runCommand: async (command, args, runOptions) => {
+              const activeProvider = await resolveActiveProviderForService(
+                container,
+                canonicalService,
+                { readOnly: flags.dryRun }
+              );
+              const details = await resolveIsolatedEnvDetails(
+                container.env,
+                adapter.isolatedEnv,
+                canonicalService,
+                activeProvider
+              );
+              const runtimeEnv = adapter.runtimeEnv ? await resolveProviderRuntimeEnv(
+                container.env,
+                adapter.runtimeEnv,
+                canonicalService,
+                activeProvider
+              ) : {};
+              let forwarded = args;
+              if (adapter.isolatedEnv?.cliSettings) {
+                const resolvedSettings = await resolveCliSettings(
+                  adapter.isolatedEnv.cliSettings,
+                  container.env,
+                  activeProvider
+                );
+                forwarded = buildArgsWithMergedSettings(args, resolvedSettings);
+              }
+              return resources.context.runCommand(details.agentBinary, forwarded, {
+                ...runOptions,
+                env: {
+                  ...activeProvider?.extraEnv ?? {},
+                  ...details.env,
+                  ...runtimeEnv,
+                  ...runOptions?.env ?? {}
+                }
+              });
+            },
             logDryRun: (message2) => providerContext.logger.dryRun(message2),
             logWarning: (message2) => providerContext.logger.warn(message2)
           });
@@ -103780,6 +103545,7 @@ var init_test = __esm({
     init_configure();
     init_src2();
     init_isolated_env();
+    init_cli_settings_merge();
   }
 });
 
@@ -147312,7 +147078,7 @@ var init_package2 = __esm({
   "package.json"() {
     package_default2 = {
       name: "poe-code",
-      version: "3.0.454",
+      version: "4.0.0",
       description: "CLI tool to configure Poe API for developer workflows.",
       license: "MIT",
       type: "module",
@@ -147410,9 +147176,6 @@ var init_package2 = __esm({
         poe: "dist/bin.cjs",
         "poe-code": "dist/bin.cjs",
         "poe-code-configure": "dist/bin.cjs",
-        "poe-claude": "dist/bin/poe-claude.js",
-        "poe-codex": "dist/bin/poe-codex.js",
-        "poe-opencode": "dist/bin/poe-opencode.js",
         "poe-agent": "dist/bin/poe-agent.js",
         "poe-superintendent-mcp": "packages/superintendent/dist/mcp.js",
         "tiny-oauth-test-server": "packages/tiny-oauth-test-server/dist/cli.js",
@@ -148182,7 +147945,6 @@ function bootstrapProgram(container) {
     extraServices: ["poe-agent"]
   });
   registerGaslightCommand(program, container);
-  registerWrapCommand(program, container);
   registerTestCommand(program, container);
   registerUnconfigureCommand(program, container);
   registerLoginCommand(program, container);
@@ -148317,7 +148079,6 @@ var init_program = __esm({
     init_agent2();
     await init_spawn6();
     init_spawn_poe_agent();
-    init_wrap2();
     init_login();
     init_logout();
     init_auth();
@@ -148360,7 +148121,6 @@ var init_program = __esm({
       { path: ["agent"] },
       { path: ["spawn"] },
       { path: ["gaslight"], args: "[plan-path]" },
-      { path: ["wrap"] },
       { path: ["test"] },
       { path: ["models"] },
       { path: ["pipeline"] },