@akagilnc/pi-workflow-roles 0.1.3737 → 0.1.3744

package/dist/public-cli/option-definitions.js

@@ -1068,7 +1068,7 @@ const SUPPORT_COMMAND_HELP = {
     },
     config: {
         command: "config",
-        summary: "Persistent seat model, labor-engine, host, and auto-resume defaults.",
+        summary: "Persistent seat model, labor-engine, host, and auto-resume defaults. Host providers live in ~/.ak-roles/host-providers.json (owner-edited).",
         usage: [
             "ak-role config set <seat> <provider/model[:thinking]> [<seat> <spec> ...]",
             "ak-role config unset <gatekeeper|inspector|notary>",
@@ -1077,8 +1077,6 @@ const SUPPORT_COMMAND_HELP = {
             "ak-role config set-host <seat> <name>",
             "ak-role config unset-host <seat>",
             "ak-role config set-auto-resume-limit <N>",
-            "ak-role config set-provider-alias <provider> <host> <alias>",
-            "ak-role config unset-provider-alias <provider> <host>",
         ],
         examples: [
             "ak-role config set judge openai-codex/gpt-5.6-sol:high",
@@ -1086,7 +1084,6 @@ const SUPPORT_COMMAND_HELP = {
             "ak-role config set-engine judge opus",
             "ak-role config set-host judge grok-build",
             "ak-role config set-auto-resume-limit 3",
-            "ak-role config set-provider-alias xai hermes xai-oauth",
         ],
     },
     help: {

package/dist/public-role-summons.js

@@ -70,9 +70,6 @@ function projectSeatEngine(seat) {
 function projectSeatHost(seat) {
   return seat.host === void 0 ? {} : { host: seat.host };
 }
-function projectSeatModel(seat) {
-  return seat.selection === void 0 ? {} : { model: seat.selection };
-}
 async function createSummonEnv(options) {
   const [{ piDurablePrincipalAuthority }, { appendPiSessionCustomEntry, createPiRoleTurnHost }] = await Promise.all([
     import("./pi/durable-principal.js"),
@@ -122,6 +119,13 @@ async function createSummonEnv(options) {
       }
     };
   }
+  const { loadHostProvidersTable, projectHostFacingProvider } = await import("./public-cli/host-providers.js");
+  const hostFacingSelection = options.seat.selection === void 0 ? void 0 : projectHostFacingProvider(
+    options.seat.selection,
+    hostName,
+    loadHostProvidersTable(options.home),
+    options.home
+  );
   return {
     home: options.home,
     principalAuthority,
@@ -131,7 +135,7 @@ async function createSummonEnv(options) {
     roleTurnHost,
     cwd: options.cwd,
     credentials: options.credentials,
-    ...projectSeatModel(options.seat),
+    ...hostFacingSelection === void 0 ? {} : { model: hostFacingSelection },
     ...projectSeatEngine(options.seat),
     ...projectSeatHost(options.seat)
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.3737",
+  "version": "0.1.3744",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/public-cli/cli.ts

@@ -28,14 +28,17 @@ import {
   setPersistentSeatConfig,
   setPersistentSeatEngine,
   setPersistentSeatHost,
-  setProviderHostAlias,
-  unsetProviderHostAlias,
   validatePublicCliConfigAxes,
   type CredentialProviders,
   type EffectiveSeat,
   type InvocationModelOverride,
   type PublicCliConfig,
 } from "./config.ts";
+import {
+  loadHostProvidersTable,
+  projectHostFacingProvider,
+  renderHostProvidersTable,
+} from "./host-providers.ts";
 import { seatModelOnly } from "./registry.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import type { CliIo } from "./cli-io.ts";
@@ -428,23 +431,36 @@ function createRoleEnvironment(
 
   // #617 DK-3: resume and new legs share one seat resolution — model/host/engine
   // come from the live seat table (invocation flag → persistent → default).
+  // #788 expectation 2: select a registered host first; only then project the
+  // host-facing provider (table > unique directory > fail). Bad host never
+  // reaches model resolution.
+  const roleTurnHost = resolveRoleTurnHost(env, {
+    role,
+    seat: options.seat,
+    principalAuthority: env.principalAuthority!,
+    ...(extraPiArgs === undefined ? {} : { extraPiArgs }),
+    ...(timeoutMs === undefined ? {} : { timeoutMs }),
+  });
+  const hostFacingSelection =
+    options.seat.selection === undefined
+      ? undefined
+      : projectHostFacingProvider(
+          options.seat.selection,
+          options.seat.host,
+          loadHostProvidersTable(options.home),
+          options.home,
+        );
   return {
     home: options.home,
     principalAuthority: env.principalAuthority!,
     agentDir: options.agentDir,
     sessionAppender: appendPiSessionCustomEntry,
     packageRoot: env.packageRoot,
-    roleTurnHost: resolveRoleTurnHost(env, {
-      role,
-      seat: options.seat,
-      principalAuthority: env.principalAuthority!,
-      ...(extraPiArgs === undefined ? {} : { extraPiArgs }),
-      ...(timeoutMs === undefined ? {} : { timeoutMs }),
-    }),
+    roleTurnHost,
     cwd: options.cwd,
     ...(options.credentials === undefined ? {} : { credentials: options.credentials }),
     ...(env.correlationId === undefined ? {} : { correlationId: env.correlationId }),
-    ...(options.seat.selection === undefined ? {} : { model: options.seat.selection }),
+    ...(hostFacingSelection === undefined ? {} : { model: hostFacingSelection }),
     ...projectSeatEngine(options.seat),
     ...projectSeatHost(options.seat),
     ...(timeoutMs === undefined ? {} : { timeoutMs }),
@@ -771,7 +787,7 @@ function renderHelp(): string {
     "Persistent config: ak-role config set <seat> <provider/model[:thinking]> | unset <gatekeeper|inspector|notary>",
     "Persistent engine (callable roles): ak-role config set-engine <seat> <name> | unset-engine <seat>",
     "Persistent host (callable roles): ak-role config set-host <seat> <name> | unset-host <seat>",
-    "Provider host alias: ak-role config set-provider-alias <provider> <host> <alias> | unset-provider-alias <provider> <host>",
+    "Host providers: ~/.ak-roles/host-providers.json (owner-edited; table > unique host directory > fail)",
     "Host resolution: --host → persistent seat host → pi (resume uses the same order; #617)",
     "Effective seats: ak-role roles",
   );
@@ -900,7 +916,7 @@ function renderConfigDisplaySeat(row: ConfigDisplaySeat): string {
   return `${row.seat}\t${row.source}\t${model}\t${engine}\t${host}`;
 }
 
-function renderConfig(config: PublicCliConfig): string {
+function renderConfig(config: PublicCliConfig, home: string): string {
   const lines: string[] = ["seat\tsource\tmodel\tengine\thost"];
   const rows = projectConfigDisplaySeats(config);
   if (rows.length === 0) {
@@ -912,17 +928,9 @@ function renderConfig(config: PublicCliConfig): string {
   }
   // #422: show the effective auto-resume ceiling (configured value or default).
   lines.push(`autoResumeLimit\t${config.autoResumeLimit ?? AUTO_RESUME_LIMIT}`);
-  // #778: owner-registered provider→host aliases (disk face; seats stay as written).
-  const aliases = config.providerAliases;
-  if (aliases !== undefined) {
-    for (const provider of Object.keys(aliases).sort()) {
-      const byHost = aliases[provider]!;
-      for (const host of Object.keys(byHost).sort()) {
-        lines.push(`providerAlias\t${provider}\t${host}\t${byHost[host]}`);
-      }
-    }
-  }
-  return `${lines.join("\n")}\n`;
+  // #788: owner host-providers table as written on disk (separate file).
+  const hostProvidersBlock = renderHostProvidersTable(loadHostProvidersTable(home));
+  return `${lines.join("\n")}\n${hostProvidersBlock}`;
 }
 
 async function runConfigCommand(
@@ -942,7 +950,7 @@ async function runConfigCommand(
       );
       return 0;
     }
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -971,7 +979,7 @@ async function runConfigCommand(
       config = setPersistentSeatConfig(config, seat, parseModelSpec(spec));
     }
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -993,7 +1001,7 @@ async function runConfigCommand(
       seat,
     );
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -1011,7 +1019,7 @@ async function runConfigCommand(
       throw new CliUsageError(error instanceof Error ? error.message : String(error), { cause: error });
     }
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -1035,7 +1043,7 @@ async function runConfigCommand(
       );
     }
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -1057,7 +1065,7 @@ async function runConfigCommand(
       );
     }
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 
@@ -1090,48 +1098,7 @@ async function runConfigCommand(
     let config = await loadAndValidateConfig(home, packageRoot);
     config = setAutoResumeLimit(config, converted);
     await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
-    return 0;
-  }
-
-  // #778: owner-registered provider→host alias (opaque strings; no host catalog).
-  if (args[0] === "set-provider-alias") {
-    if (args.length !== 4) {
-      throw new CliUsageError(
-        "usage: ak-role config set-provider-alias <provider> <host> <alias>",
-      );
-    }
-    let config = await loadAndValidateConfig(home, packageRoot);
-    try {
-      config = setProviderHostAlias(config, args[1]!, args[2]!, args[3]!);
-    } catch (error) {
-      throw new CliUsageError(
-        error instanceof Error ? error.message : String(error),
-        { cause: error },
-      );
-    }
-    await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
-    return 0;
-  }
-
-  if (args[0] === "unset-provider-alias") {
-    if (args.length !== 3) {
-      throw new CliUsageError(
-        "usage: ak-role config unset-provider-alias <provider> <host>",
-      );
-    }
-    let config = await loadAndValidateConfig(home, packageRoot);
-    try {
-      config = unsetProviderHostAlias(config, args[1]!, args[2]!);
-    } catch (error) {
-      throw new CliUsageError(
-        error instanceof Error ? error.message : String(error),
-        { cause: error },
-      );
-    }
-    await savePublicCliConfig(config, home);
-    io.stdout(renderConfig(config));
+    io.stdout(renderConfig(config, home));
     return 0;
   }
 

package/src/public-cli/config.ts

@@ -54,15 +54,6 @@ export type PersistentSeatConfig = {
   host?: string;
 };
 
-/**
- * #778: owner-registered provider name by host. Keyed seat-table provider →
- * host → host-facing provider. Package code carries the map only — no built-in
- * pairs. Unregistered (provider, host) pairs pass the seat provider through.
- */
-export type ProviderHostAliases = Readonly<
-  Record<string, Readonly<Record<string, string>>>
->;
-
 export type PublicCliConfig = {
   seats: Partial<Record<PublicConfigurableSeat, PersistentSeatConfig>>;
   /**
@@ -72,11 +63,6 @@ export type PublicCliConfig = {
    * bound (ADR 0035).
    */
   autoResumeLimit?: number;
-  /**
-   * #778: owner-registered provider→host aliases. Sibling of `seats`; never
-   * invents pairs. Absent or empty means pure pass-through.
-   */
-  providerAliases?: ProviderHostAliases;
   /**
    * #592: opaque seat rows this build does not own. Carried through every
    * parse→save cycle so a write never silently erases neighboring-line rows
@@ -307,81 +293,6 @@ export function setAutoResumeLimit(
   return { ...config, autoResumeLimit: parseAutoResumeLimit(limit) };
 }
 
-function requireNonEmptyToken(value: string, label: string): string {
-  const trimmed = value.trim();
-  if (trimmed === "") {
-    throw new Error(`${label} must be a non-empty string`);
-  }
-  return trimmed;
-}
-
-/**
- * #778: register one owner provider→host alias. Opaque strings only — no host
- * catalog check and no built-in provider pairs. Sibling keys (seats included)
- * are preserved.
- */
-export function setProviderHostAlias(
-  config: PublicCliConfig,
-  provider: string,
-  host: string,
-  alias: string,
-): PublicCliConfig {
-  const from = requireNonEmptyToken(provider, "provider");
-  const hostName = requireNonEmptyToken(host, "host");
-  const to = requireNonEmptyToken(alias, "alias");
-  const previous = config.providerAliases ?? {};
-  return {
-    ...config,
-    providerAliases: {
-      ...previous,
-      [from]: {
-        ...(previous[from] ?? {}),
-        [hostName]: to,
-      },
-    },
-  };
-}
-
-/** #778: drop one owner provider→host alias. Empty map collapses to absent. */
-export function unsetProviderHostAlias(
-  config: PublicCliConfig,
-  provider: string,
-  host: string,
-): PublicCliConfig {
-  const from = requireNonEmptyToken(provider, "provider");
-  const hostName = requireNonEmptyToken(host, "host");
-  const previous = config.providerAliases;
-  if (previous === undefined || previous[from] === undefined) return config;
-  const { [hostName]: _dropped, ...restHosts } = previous[from]!;
-  const nextForProvider =
-    Object.keys(restHosts).length === 0 ? undefined : restHosts;
-  const { [from]: _provider, ...restProviders } = previous;
-  const nextAliases =
-    nextForProvider === undefined
-      ? restProviders
-      : { ...restProviders, [from]: nextForProvider };
-  if (Object.keys(nextAliases).length === 0) {
-    const { providerAliases: _gone, ...rest } = config;
-    return rest;
-  }
-  return { ...config, providerAliases: nextAliases };
-}
-
-/**
- * #778: project seat-table provider through owner aliases for one host.
- * Unregistered pairs return the seat selection unchanged (pass-through).
- */
-export function applyProviderHostAlias(
-  selection: SeatModelConfig | undefined,
-  host: string,
-  aliases: ProviderHostAliases | undefined,
-): SeatModelConfig | undefined {
-  if (selection === undefined || aliases === undefined) return selection;
-  const mapped = aliases[selection.provider]?.[host];
-  if (mapped === undefined) return selection;
-  return { ...selection, provider: mapped };
-}
-
 /**
  * Config-parse seam: persistent call axes belong to PUBLIC_CALLABLE_ROLES;
  * engine names need only path-safety syntax (no closed material catalog;
@@ -476,7 +387,6 @@ export function buildSeatModelCliArgs(model: SeatModelConfig | undefined): strin
 function serializePublicCliConfig(config: PublicCliConfig): {
   seats: Record<string, unknown>;
   autoResumeLimit?: number;
-  providerAliases?: ProviderHostAliases;
 } {
   return {
     // Known seats win on any key clash; by construction the two maps are
@@ -488,48 +398,9 @@ function serializePublicCliConfig(config: PublicCliConfig): {
     ...(config.autoResumeLimit === undefined
       ? {}
       : { autoResumeLimit: config.autoResumeLimit }),
-    ...(config.providerAliases === undefined ||
-    Object.keys(config.providerAliases).length === 0
-      ? {}
-      : { providerAliases: config.providerAliases }),
   };
 }
 
-function parseProviderHostAliases(value: unknown): ProviderHostAliases {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) {
-    throw new Error("public CLI config.providerAliases must be an object");
-  }
-  const out: Record<string, Record<string, string>> = {};
-  for (const [provider, byHost] of Object.entries(value as Record<string, unknown>)) {
-    if (provider.trim() === "") {
-      throw new Error("public CLI config.providerAliases provider key must be non-empty");
-    }
-    if (byHost === null || typeof byHost !== "object" || Array.isArray(byHost)) {
-      throw new Error(
-        `public CLI config.providerAliases[${provider}] must be an object`,
-      );
-    }
-    const hosts: Record<string, string> = {};
-    for (const [host, alias] of Object.entries(byHost as Record<string, unknown>)) {
-      if (host.trim() === "") {
-        throw new Error(
-          `public CLI config.providerAliases[${provider}] host key must be non-empty`,
-        );
-      }
-      if (typeof alias !== "string" || alias.trim() === "") {
-        throw new Error(
-          `public CLI config.providerAliases[${provider}][${host}] must be a non-empty string`,
-        );
-      }
-      hosts[host] = alias;
-    }
-    if (Object.keys(hosts).length > 0) {
-      out[provider] = hosts;
-    }
-  }
-  return out;
-}
-
 function parsePublicCliConfig(value: unknown): PublicCliConfig {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     throw new Error("public CLI config must be an object");
@@ -537,7 +408,6 @@ function parsePublicCliConfig(value: unknown): PublicCliConfig {
   const record = value as {
     seats?: unknown;
     autoResumeLimit?: unknown;
-    providerAliases?: unknown;
     unknownSeats?: unknown;
   };
   // #422 round-trip preservation: the sibling top-level key must survive every
@@ -546,15 +416,6 @@ function parsePublicCliConfig(value: unknown): PublicCliConfig {
   if (record.autoResumeLimit !== undefined) {
     autoResumeLimit = parseAutoResumeLimit(record.autoResumeLimit);
   }
-  // #778: same survival duty as autoResumeLimit — owner aliases must not vanish
-  // on an unrelated seat write.
-  let providerAliases: ProviderHostAliases | undefined;
-  if (record.providerAliases !== undefined) {
-    const parsed = parseProviderHostAliases(record.providerAliases);
-    if (Object.keys(parsed).length > 0) {
-      providerAliases = parsed;
-    }
-  }
   // #592: opaque bucket may already be present on an in-memory round-trip
   // (load→set→save calls parse again). Carry it before seats iteration so a
   // disk-shaped seats map and a memory-shaped bucket both survive.
@@ -572,7 +433,6 @@ function parsePublicCliConfig(value: unknown): PublicCliConfig {
   const withOpaque = (seats: PublicCliConfig["seats"]): PublicCliConfig => ({
     seats,
     ...(autoResumeLimit === undefined ? {} : { autoResumeLimit }),
-    ...(providerAliases === undefined ? {} : { providerAliases }),
     ...(Object.keys(unknownSeats).length === 0 ? {} : { unknownSeats }),
   });
   if (record.seats === undefined) {
@@ -818,23 +678,13 @@ export function resolveEffectiveSeat(
     }
   }
 
-  const withAxes = attachHostAxis(
+  // Seat axes only. Host-facing provider projection (#788) runs after the host
+  // is selected as registered — never before (bad host must not reach model).
+  return attachHostAxis(
     attachEngineAxis(modelSeat, config, invocation),
     config,
     invocation,
   );
-  // #778: host-facing provider is the seat-table value after owner aliases.
-  // Disk seats stay as written; only the effective selection is projected.
-  const selection = applyProviderHostAlias(
-    withAxes.selection,
-    withAxes.host,
-    config.providerAliases,
-  );
-  if (selection === undefined) {
-    const { selection: _dropped, ...rest } = withAxes;
-    return rest;
-  }
-  return { ...withAxes, selection };
 }
 
 export function effectiveSeatConfigurations(