@desplega.ai/agent-swarm 1.173.0 → 2.0.0

package/src/be/seed-scripts/catalog/ops-catalog-audit.ts

@@ -38,7 +38,7 @@ const CONTRADICTORY_RE =
   /\b(do not|don't|never)\b[\s\S]{0,240}\b(always|must|required)\b|\b(always|must|required)\b[\s\S]{0,240}\b(do not|don't|never)\b/i;
 
 const CODE_REGISTRY_EVENTS =
-  "agentmail.email.followup agentmail.email.mapped_lead agentmail.email.mapped_worker agentmail.email.no_agent agentmail.email.unmapped common.command_suggestions.github_comment_issue common.command_suggestions.github_comment_pr common.command_suggestions.github_issue common.command_suggestions.github_pr common.command_suggestions.gitlab_issue common.command_suggestions.gitlab_mr common.delegation_instruction common.delegation_instruction.gitlab github.check_run.failed github.check_suite.failed github.comment.mentioned github.issue.assigned github.issue.labeled github.issue.mentioned github.pull_request.assigned github.pull_request.closed github.pull_request.labeled github.pull_request.mentioned github.pull_request.review_requested github.pull_request.review_submitted github.pull_request.synchronize github.workflow_run.failed gitlab.comment.mentioned gitlab.issue.assigned gitlab.merge_request.opened gitlab.pipeline.failed heartbeat.boot-triage heartbeat.checklist jira.issue.assigned jira.issue.commented jira.issue.followup kapso.message.received linear.issue.assigned linear.issue.followup linear.issue.reassigned slack.assistant.greeting slack.assistant.offline slack.assistant.suggested_prompts slack.message.attachment_failed slack.message.thread_context system.agent.communication system.agent.lead system.agent.memory system.agent.memory.remote system.agent.outputs system.agent.outputs.no_agent_fs system.agent.repository system.agent.role system.agent.secrets system.agent.slack system.agent.tools_skills system.agent.worker system.agent.worker.remote system.agent.workspace system.agent.workspace.remote system.session.lead system.session.lead.managed system.session.worker system.session.worker.managed system.session.worker.remote task.budget.refused task.requester.profile task.worker.completed task.worker.failed".split(
+  "agentmail.email.followup agentmail.email.mapped_lead agentmail.email.mapped_worker agentmail.email.no_agent agentmail.email.unmapped chat.message.thread_context common.command_suggestions.github_comment_issue common.command_suggestions.github_comment_pr common.command_suggestions.github_issue common.command_suggestions.github_pr common.command_suggestions.gitlab_issue common.command_suggestions.gitlab_mr common.delegation_instruction common.delegation_instruction.gitlab github.check_run.failed github.check_suite.failed github.comment.mentioned github.issue.assigned github.issue.labeled github.issue.mentioned github.pull_request.assigned github.pull_request.closed github.pull_request.labeled github.pull_request.mentioned github.pull_request.review_requested github.pull_request.review_submitted github.pull_request.synchronize github.workflow_run.failed gitlab.comment.mentioned gitlab.issue.assigned gitlab.merge_request.opened gitlab.pipeline.failed heartbeat.boot-triage heartbeat.checklist jira.issue.assigned jira.issue.commented jira.issue.followup kapso.message.received linear.issue.assigned linear.issue.followup linear.issue.reassigned slack.assistant.greeting slack.assistant.offline slack.assistant.suggested_prompts slack.message.attachment_failed slack.message.thread_context system.agent.communication system.agent.lead system.agent.memory system.agent.memory.remote system.agent.outputs system.agent.outputs.no_agent_fs system.agent.repository system.agent.role system.agent.secrets system.agent.slack system.agent.tools_skills system.agent.worker system.agent.worker.remote system.agent.workspace system.agent.workspace.remote system.session.lead system.session.lead.managed system.session.worker system.session.worker.managed system.session.worker.remote task.budget.refused task.requester.profile task.worker.completed task.worker.failed".split(
     " ",
   );
 

package/src/be/seed-skills/bundled-files.generated.json

@@ -1,22 +1,4 @@
 {
-  "artifacts": [
-    {
-      "path": "examples/approval-flow.ts",
-      "content": "import { createArtifactServer } from \"../../src/artifact-sdk\";\nimport { Hono } from \"hono\";\n\nconst app = new Hono();\napp.get(\"/\", (c) =>\n  c.html(`\n<!DOCTYPE html>\n<html>\n<head><title>Approval Required</title></head>\n<body>\n  <h1>PR #42 — Review Required</h1>\n  <p>Agent wants to merge this PR. Please review.</p>\n  <button id=\"approve\">Approve</button>\n  <button id=\"reject\">Reject</button>\n  <script src=\"/@swarm/sdk.js\"></script>\n  <script>\n    const swarm = new SwarmSDK();\n    document.getElementById('approve').onclick = async () => {\n      await swarm.createTask({ task: 'Merge PR #42 — human approved' });\n      document.body.innerHTML = '<h1>Approved! Task created.</h1>';\n    };\n    document.getElementById('reject').onclick = async () => {\n      await swarm.createTask({ task: 'PR #42 rejected by human — needs changes' });\n      document.body.innerHTML = '<h1>Rejected. Agent notified.</h1>';\n    };\n  </script>\n</body>\n</html>\n`),\n);\n\nconst server = createArtifactServer({ name: \"approval-pr-42\", app });\nawait server.start();\nconsole.log(`Approval artifact at: ${server.url}`);\n"
-    },
-    {
-      "path": "examples/hono-dashboard.ts",
-      "content": "import { createArtifactServer } from \"../../src/artifact-sdk\";\nimport { Hono } from \"hono\";\n\nconst app = new Hono();\n\napp.get(\"/\", (c) =>\n  c.html(`\n<!DOCTYPE html>\n<html>\n<head><title>Dashboard</title></head>\n<body>\n  <h1>Agent Dashboard</h1>\n  <div id=\"agents\"></div>\n  <script src=\"/@swarm/sdk.js\"></script>\n  <script>\n    const swarm = new SwarmSDK();\n    swarm.getSwarm().then(agents => {\n      document.getElementById('agents').innerHTML =\n        '<ul>' + agents.map(a => '<li>' + a.name + ' (' + a.status + ')</li>').join('') + '</ul>';\n    });\n  </script>\n</body>\n</html>\n`),\n);\n\napp.get(\"/api/status\", (c) => c.json({ status: \"ok\", timestamp: Date.now() }));\n\nconst server = createArtifactServer({ name: \"dashboard\", app });\nawait server.start();\nconsole.log(`Dashboard live at: ${server.url}`);\n"
-    },
-    {
-      "path": "examples/multi-artifact.ts",
-      "content": "import { createArtifactServer } from \"../../src/artifact-sdk\";\nimport { Hono } from \"hono\";\n\n// Artifact 1: Status page\nconst statusApp = new Hono();\nstatusApp.get(\"/\", (c) => c.html(\"<h1>Status: All systems operational</h1>\"));\n\n// Artifact 2: Data viewer\nconst dataApp = new Hono();\ndataApp.get(\"/\", (c) => c.json({ items: [1, 2, 3], generated: new Date().toISOString() }));\n\nconst status = createArtifactServer({ name: \"status\", app: statusApp });\nconst data = createArtifactServer({ name: \"data\", app: dataApp });\n\nawait status.start();\nawait data.start();\n\nconsole.log(`Status page: ${status.url}`);\nconsole.log(`Data viewer: ${data.url}`);\nconsole.log(`Both artifacts running on different ports (${status.port}, ${data.port})`);\n"
-    },
-    {
-      "path": "examples/static-report.sh",
-      "content": "#!/bin/bash\n# Serve a static HTML report as an artifact\nARTIFACT_DIR=\"/workspace/personal/artifacts/my-report\"\nmkdir -p \"$ARTIFACT_DIR\"\n\ncat > \"$ARTIFACT_DIR/index.html\" << 'HTML'\n<!DOCTYPE html>\n<html>\n<head><title>Agent Report</title></head>\n<body>\n  <h1>Analysis Report</h1>\n  <p>Generated by agent</p>\n</body>\n</html>\nHTML\n\nagent-swarm artifact serve \"$ARTIFACT_DIR\" --name \"my-report\"\n"
-    }
-  ],
   "brainstorming": [
     {
       "path": "template.md",

package/src/be/seed-skills/index.ts

@@ -16,8 +16,6 @@ import agentBrowserContent from "../../../templates/skills/agent-browser/content
 };
 import appsConfig from "../../../templates/skills/apps/config.json" with { type: "text" };
 import appsContent from "../../../templates/skills/apps/content.md" with { type: "text" };
-import artifactsConfig from "../../../templates/skills/artifacts/config.json" with { type: "text" };
-import artifactsContent from "../../../templates/skills/artifacts/content.md" with { type: "text" };
 import askUserConfig from "../../../templates/skills/ask-user/config.json" with { type: "text" };
 import askUserContent from "../../../templates/skills/ask-user/content.md" with { type: "text" };
 import assetNamespacesConfig from "../../../templates/skills/asset-namespaces/config.json" with {
@@ -38,6 +36,8 @@ import brainstormingConfig from "../../../templates/skills/brainstorming/config.
 import brainstormingContent from "../../../templates/skills/brainstorming/content.md" with {
   type: "text",
 };
+import chatSdkConfig from "../../../templates/skills/chat-sdk/config.json" with { type: "text" };
+import chatSdkContent from "../../../templates/skills/chat-sdk/content.md" with { type: "text" };
 import codeQualityConfig from "../../../templates/skills/code-quality/config.json" with {
   type: "text",
 };
@@ -96,6 +96,12 @@ import downloadTaskAttachmentConfig from "../../../templates/skills/download-tas
 import downloadTaskAttachmentContent from "../../../templates/skills/download-task-attachment/content.md" with {
   type: "text",
 };
+import emailDomainHealthConfig from "../../../templates/skills/email-domain-health/config.json" with {
+  type: "text",
+};
+import emailDomainHealthContent from "../../../templates/skills/email-domain-health/content.md" with {
+  type: "text",
+};
 import engineeringStandardsConfig from "../../../templates/skills/engineering-standards/config.json" with {
   type: "text",
 };
@@ -270,9 +276,11 @@ import wtsExpertConfig from "../../../templates/skills/wts-expert/config.json" w
 import wtsExpertContent from "../../../templates/skills/wts-expert/content.md" with {
   type: "text",
 };
+import type { Skill } from "../../types";
 import {
   computeContentHash,
   createSkill,
+  deleteSkill,
   deleteSkillFile,
   getDbClient,
   getSkillByName,
@@ -280,7 +288,9 @@ import {
   updateSkill,
   upsertSkillFiles,
 } from "../db";
+import { deleteSeedState, getSeedState } from "../seed/state-db";
 import type { Seeder, SeedItem } from "../seed/types";
+import { parseSkillContent } from "../skill-parser";
 import bundledFilesManifest from "./bundled-files.generated.json";
 import { buildSkillContent, type SkillTemplateConfig } from "./render";
 
@@ -321,11 +331,11 @@ const BUILT_IN_SKILL_FILES = bundledFilesManifest as Record<string, SeedSkillFil
 const BUILT_IN_SKILL_SOURCES = [
   { config: agentBrowserConfig, body: agentBrowserContent },
   { config: appsConfig, body: appsContent },
-  { config: artifactsConfig, body: artifactsContent },
   { config: askUserConfig, body: askUserContent },
   { config: assetNamespacesConfig, body: assetNamespacesContent },
   { config: attioInteractionConfig, body: attioInteractionContent },
   { config: brainstormingConfig, body: brainstormingContent },
+  { config: chatSdkConfig, body: chatSdkContent },
   { config: codeQualityConfig, body: codeQualityContent },
   { config: codeReviewingConfig, body: codeReviewingContent },
   { config: commsConfig, body: commsContent },
@@ -337,6 +347,7 @@ const BUILT_IN_SKILL_SOURCES = [
   { config: delegateWorkConfig, body: delegateWorkContent },
   { config: designDocsConfig, body: designDocsContent },
   { config: downloadTaskAttachmentConfig, body: downloadTaskAttachmentContent },
+  { config: emailDomainHealthConfig, body: emailDomainHealthContent },
   { config: engineeringStandardsConfig, body: engineeringStandardsContent },
   { config: heartbeatRunbookConfig, body: heartbeatRunbookContent },
   { config: implementingConfig, body: implementingContent },
@@ -527,6 +538,94 @@ async function syncSeededSkillFiles(skillId: string, files: SeedSkillFile[]): Pr
   if (files.length > 0) await upsertSkillFiles(skillId, files);
 }
 
+/**
+ * Skills this catalog used to seed and no longer ships. Dropping a template
+ * alone leaves its last seeded row live on every existing install, so agents
+ * keep reading instructions for a removed feature. `artifacts` documented the
+ * PM2 + localtunnel serving path, removed together with PM2.
+ */
+export const RETIRED_SEED_SKILLS: readonly string[] = ["artifacts"];
+
+/**
+ * True when every user-editable column outside the seed hash still holds what
+ * `skillsSeeder.apply` writes. The seed hash covers only content,
+ * systemDefault, userInvocable and bundled files, so an edit to any other
+ * column (description, model, allowedTools, source fields, ...) is invisible
+ * to it. The seeder writes the description from the same config as the
+ * content's frontmatter, so a pristine row's description equals the
+ * frontmatter one; every other column keeps its insert default.
+ */
+function metadataAsSeeded(skill: Skill, fileCount: number): boolean {
+  let seededDescription: string;
+  try {
+    seededDescription = parseSkillContent(skill.content).description;
+  } catch {
+    return false;
+  }
+
+  return (
+    skill.description === seededDescription &&
+    skill.type === "personal" &&
+    skill.isComplex === fileCount > 0 &&
+    skill.isEnabled &&
+    !skill.disableModelInvocation &&
+    skill.allowedTools === null &&
+    skill.model === null &&
+    skill.effort === null &&
+    skill.context === null &&
+    skill.agent === null &&
+    skill.sourceUrl === null &&
+    skill.sourceRepo === null &&
+    skill.sourcePath === null &&
+    skill.sourceBranch === "main" &&
+    skill.sourceHash === null &&
+    skill.lastFetchedAt === null
+  );
+}
+
+/**
+ * Delete each retired skill the seeder still owns: a `seed_state` row exists,
+ * the live copy hashes to what was last seeded, and its metadata is as seeded.
+ * A skill the seeder never recorded, or one a user edited since (content,
+ * files or metadata), is left in place.
+ */
+export async function retireSeedSkills(
+  names: readonly string[] = RETIRED_SEED_SKILLS,
+): Promise<string[]> {
+  const retired: string[] = [];
+
+  for (const name of names) {
+    const existing = await getSkillByName(name, "swarm");
+    if (!existing) continue;
+
+    const state = await getSeedState("skill", name);
+    if (!state) continue;
+
+    const liveFiles = (await getSkillFiles(existing.id)).map((file) => ({
+      path: file.path,
+      content: file.content,
+    }));
+    const liveHash = skillSeedHash(
+      existing.content,
+      existing.systemDefault,
+      liveFiles,
+      existing.userInvocable,
+    );
+    if (liveHash !== state.seededHash || !metadataAsSeeded(existing, liveFiles.length)) {
+      console.warn(`[seed:skill] kept retired skill "${name}": edited since it was seeded`);
+      continue;
+    }
+
+    await getDbClient().transaction(async () => {
+      await deleteSkill(existing.id);
+      await deleteSeedState("skill", name);
+    });
+    retired.push(name);
+  }
+
+  return retired;
+}
+
 type SkillSeedItem = SeedItem & { skill: SeedSkill };
 
 export const skillsSeeder: Seeder<SkillSeedItem> = {
@@ -614,4 +713,6 @@ export const skillsSeeder: Seeder<SkillSeedItem> = {
       await syncSeededSkillFiles(created.id, skill.files);
     });
   },
+
+  retire: () => retireSeedSkills(),
 };

package/src/be/swarm-config-guard.ts

@@ -1,7 +1,9 @@
+import { validateChatSdkAdaptersValue } from "../integrations/chat-sdk/schema";
 import { validateQuickJSPoolSize } from "../scripts-runtime/executors/quickjs-pool-config";
 import { normalizeSlackReactionShortcode } from "../slack/reaction-shortcode";
 import { ProviderNameSchema } from "../types";
 import { API_DRAIN_MAX_MS_LIMIT } from "../utils/api-drain";
+import { envExportRestrictedError, isEnvExportRestrictedKey } from "../utils/config-env-export";
 import { parseEnabledTools } from "../utils/enabled-tools";
 import { normalizeOrgWebsite } from "../utils/org-website";
 import { parseTaskToolManifest } from "../utils/task-tool-manifest";
@@ -24,13 +26,47 @@ import { isTierConfigKey, validateTierConfigValue } from "./model-tier-keys";
  * rejected at every write path (DB helpers, HTTP routes, MCP tools).
  */
 // Lead activation is also deployment-only: leads can write ordinary global config.
+// CHAT_SDK_API_URL_OVERRIDES points Chat SDK adapters (and the secrets they carry)
+// at another host, so it must never come from a config row.
+/**
+ * Teams SDK env fallbacks; a config row must not redirect the bot token.
+ * `@microsoft/teams.apps` reads these from `process.env`. Operators may still
+ * store them (they are not reserved), they just never reach env through
+ * `getInjectableGlobalConfigs`.
+ */
+export const TEAMS_SDK_ENV_KEYS = [
+  "SERVICE_URL",
+  "TENANT_ID",
+  "CLIENT_ID",
+  "CLIENT_SECRET",
+  "MANAGED_IDENTITY_CLIENT_ID",
+  "CLOUD",
+] as const;
+
+/** SQL literal list for the `NOT IN (...)` injection denylist in db.ts. */
+export function teamsSdkEnvKeysSql(): string {
+  return TEAMS_SDK_ENV_KEYS.map((key) => `'${key}'`).join(", ");
+}
+
 const RESERVED_KEYS = new Set([
   "API_KEY",
   "SECRETS_ENCRYPTION_KEY",
   "CORS_ALLOW_ANY_ORIGIN",
   "EXTENSION_ALLOW_LEAD_ACTIVATION",
+  "CHAT_SDK_API_URL_OVERRIDES",
 ]);
 
+// Config keys the API server owns for its own use and must NEVER hand out over
+// HTTP or to a script — workers/entrypoints read config to build their env, and
+// the agent-fs bootstrap admin key would let a compromised worker administer the
+// shared org. The API materializes these into its own process.env at boot via
+// getInjectableGlobalConfigs, so no HTTP consumer legitimately needs them.
+const API_ONLY_CONFIG_KEYS = new Set(["API_AGENT_FS_API_KEY", "SLACK_SIGNING_SECRET"]);
+
+export function isApiOnlyConfigKey(key: string): boolean {
+  return API_ONLY_CONFIG_KEYS.has(key);
+}
+
 /** Config rows owned by dedicated API surfaces, not the generic config API. */
 export const INTERNAL_CONFIG_KEYS = new Set(["onboarding_state", "runtime_owner_id"]);
 
@@ -254,6 +290,7 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
     ["RUNTIME_WAKE_GRACE_SEC", "RUNTIME_WAKE_REROUTE_SEC", "RUNTIME_ROUTING_INTERVAL_MS"],
     0,
   ),
+  CHAT_SDK_ADAPTERS: validateChatSdkAdaptersValue,
   TASK_TOOL_MANIFESTS: (value) => {
     try {
       if (typeof value !== "string") throw new Error("Expected JSON string");
@@ -380,6 +417,7 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
     "OPENROUTER_APP_ATTRIBUTION",
     "CURSOR_NATIVE_SYSTEM_PROMPT",
     "SLACK_DISABLE",
+    "CHAT_SDK_ENABLED",
     "SLACK_RENDER_V2",
     "SLACK_RENDER_V2_DELEGATION",
     "SLACK_BLOCK_EXTERNAL_CHANNELS",
@@ -474,6 +512,10 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
   ...integerValidators(["APPROVAL_REQUEST_AUTO_CANCELLATION_DAYS"], 0),
   // 0 turns the shutdown drain off; the shutdown path clamps to the same limit.
   ...boundedIntegerValidators(["API_DRAIN_MAX_MS"], 0, API_DRAIN_MAX_MS_LIMIT),
+  // Chat SDK thread buffer window. 0 or an invalid value falls back to the 10 s
+  // default in thread-buffer.ts; above 10 minutes a
+  // reply waits longer than any operator expects.
+  ...boundedIntegerValidators(["CHAT_SDK_BUFFER_MS"], 1, 600_000),
   // Below ~100 tokens the preamble can't fit a useful summary; above 20000
   // (~80k chars) it risks the SIGTERM-143 context-saturation failure mode
   // the cap exists to prevent (see context-preamble.ts).
@@ -495,3 +537,13 @@ export function validateConfigValue(key: string, value: unknown): string | null
   const validator = VALIDATED_KEYS[key.toUpperCase()];
   return validator ? validator(value) : null;
 }
+
+/**
+ * Rejects `exportToEnv: true` for keys only the API server reads. Omitting the
+ * flag is fine: the write path stores false for those keys.
+ */
+export function validateExportToEnv(key: string, exportToEnv: boolean | undefined): string | null {
+  return exportToEnv === true && isEnvExportRestrictedKey(key)
+    ? envExportRestrictedError(key)
+    : null;
+}

package/src/cli.tsx

@@ -303,12 +303,6 @@ const COMMAND_HELP: Record<
     options: "  Internal command; no user-facing options",
     examples: `  ${binName} session-summary-stdin`,
   },
-  artifact: {
-    usage: `${binName} artifact <subcommand> [options]`,
-    description: "Manage agent artifacts (serve, list, etc.).",
-    options: "  -h, --help             Show this help",
-    examples: [`  ${binName} artifact serve`, `  ${binName} artifact help`].join("\n"),
-  },
   x: {
     usage: `${binName} x <target> [args]`,
     description:
@@ -445,7 +439,6 @@ function printHelp(command?: string) {
     ["hook", "Handle Claude Code hook events (stdin)"],
     ["codex-hook", "Handle Codex CLI hook events (stdin, steering delivery)"],
     ["session-summary-stdin", "Generate a Claude session summary (internal, stdin)"],
-    ["artifact", "Manage agent artifacts"],
     ["x", "Execute external command routes"],
     ["scripts", "Reusable scripts maintenance"],
     ["rbac", "RBAC role management (bootstrap)"],
@@ -774,15 +767,6 @@ if (args.showHelp || args.command === "help" || args.command === undefined) {
   const { runSessionSummaryFromStdin } = await import("./hooks/hook.ts");
   await runSessionSummaryFromStdin();
   process.exit(process.exitCode ?? 0);
-} else if (args.command === "artifact") {
-  // Pass all args after "artifact" directly
-  const artifactArgs = process.argv.slice(process.argv.indexOf("artifact") + 1);
-  const { runArtifact } = await import("./commands/artifact");
-  await runArtifact(artifactArgs[0] || "help", {
-    additionalArgs: artifactArgs.slice(1),
-    port: args.port,
-    key: args.key,
-  });
 } else if (args.command === "x") {
   const xArgs = process.argv.slice(process.argv.indexOf("x") + 1);
   const { runXCommand } = await import("./commands/x");

package/src/commands/onboard/non-interactive.ts

@@ -1,3 +1,4 @@
+import { openAICompatibleProviders, providerKeyVars } from "@desplega/model-catalog";
 import {
   type HarnessProvider,
   type InstallProvider,
@@ -42,8 +43,9 @@ type ProviderStateKey =
   | "awsSessionToken"
   | "awsProfile";
 
-const ACCEPTED_CREDENTIALS =
-  "Set one of: CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY (Claude Code); OPENAI_API_KEY (OpenAI); OPENROUTER_API_KEY (OpenRouter); or AWS_REGION plus AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY or AWS_PROFILE and a Bedrock MODEL_OVERRIDE.";
+const ACCEPTED_CREDENTIALS = `Set one of: CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY (Claude Code); OPENAI_API_KEY (OpenAI); OPENROUTER_API_KEY (OpenRouter); or AWS_REGION plus AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY or AWS_PROFILE and a Bedrock MODEL_OVERRIDE. ${openAICompatibleProviders()
+  .map((p) => `${p.displayName} (${providerKeyVars(p).join(" or ")})`)
+  .join(" and ")} keys for pi/opencode are added from the dashboard.`;
 
 const DEFERRED_CREDENTIAL_LABEL = "no credential yet";
 

package/src/commands/provider-credentials.ts

@@ -18,6 +18,13 @@
  * runs the predicate itself — it just reads the agent row.
  */
 
+import {
+  type OpenAICompatibleProvider,
+  openAICompatibleKeyVars,
+  openAICompatibleProviders,
+  providerBaseUrl,
+  providerKeyFromEnv,
+} from "@desplega/model-catalog";
 import { deriveDefaultRoute, validateRoute } from "@desplega/model-routing";
 import { ACP_TARGET_IDS, isAcpTarget } from "../providers/acp-target-catalog";
 import { checkAmpCredentials, liveTestAmpCredentials } from "../providers/amp-adapter";
@@ -116,8 +123,13 @@ export const REQUIRED_CRED_VARS_BY_PROVIDER: Record<SupportedProvider, readonly
   ],
   codex: ["OPENAI_API_KEY", "CODEX_OAUTH"],
   devin: ["DEVIN_API_KEY", "DEVIN_ORG_ID"],
-  opencode: ["OPENROUTER_API_KEY", "ANTHROPIC_API_KEY", "OPENAI_API_KEY"],
-  pi: ["ANTHROPIC_API_KEY", "OPENROUTER_API_KEY", "OPENAI_API_KEY"],
+  opencode: [
+    "OPENROUTER_API_KEY",
+    "ANTHROPIC_API_KEY",
+    "OPENAI_API_KEY",
+    ...openAICompatibleKeyVars(),
+  ],
+  pi: ["ANTHROPIC_API_KEY", "OPENROUTER_API_KEY", "OPENAI_API_KEY", ...openAICompatibleKeyVars()],
   // The ACP target owns its auth; custom targets still need a command.
   acp: [],
   dsh: ["DEEPSEEK_API_KEY", "OPENROUTER_API_KEY"],
@@ -323,6 +335,29 @@ async function checkOpenRouter(apiKey: string): Promise<LiveValidationResult> {
   };
 }
 
+/**
+ * `GET <baseUrl>/models` with a Bearer key against an OpenAI-compatible
+ * registry provider (NaN, Helmcode). Lists models, runs no inference.
+ * `baseUrl` defaults to the registry entry; the probe passes the
+ * `<ID>_BASE_URL` override, and tests inject a fake server.
+ */
+export async function checkOpenAICompatibleProvider(
+  provider: OpenAICompatibleProvider,
+  apiKey: string,
+  baseUrl: string = provider.baseUrl,
+): Promise<LiveValidationResult> {
+  const r = await timedFetch(`${baseUrl.replace(/\/+$/, "")}/models`, {
+    method: "GET",
+    headers: { Authorization: `Bearer ${apiKey}` },
+  });
+  if (r.ok) return { ok: true, latency_ms: r.latency_ms };
+  return {
+    ok: false,
+    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
+    latency_ms: r.latency_ms,
+  };
+}
+
 /**
  * Mirror of the disk check in `checkCodexCredentials` — true when the worker
  * has a materialised `~/.codex/auth.json`, which is the canonical "logged in"
@@ -365,7 +400,7 @@ function parseCodexOAuthAccess(blob: string | undefined): string | null {
  * | `claude`         | default route: Foundry / Bedrock / Vertex → gateway (`ANTHROPIC_BASE_URL` + `ANTHROPIC_AUTH_TOKEN` or `ANTHROPIC_API_KEY`) → `CLAUDE_CODE_OAUTH_TOKEN` → `ANTHROPIC_API_KEY` | the route's own `/v1/models`; OAuth presence-only; cloud routes skipped |
  * | `claude-managed` | `ANTHROPIC_API_KEY` (managed agents always use API key + managed envs)  | Anthropic `/v1/models`         |
  * | `codex`          | `~/.codex/auth.json` (file) → `CODEX_OAUTH` (env OAuth) → `OPENAI_API_KEY` | OpenAI `/v1/models` (api-key path only) |
- * | `opencode`       | auth.json (file) → `OPENROUTER_API_KEY` → `ANTHROPIC_API_KEY` → `OPENAI_API_KEY` | file presence-only, otherwise provider's `/v1/models` |
+ * | `opencode`       | auth.json (file) → `OPENROUTER_API_KEY` → `ANTHROPIC_API_KEY` → `OPENAI_API_KEY` → each registry provider key (`NAN_API_KEY` or `HELMCODE_API_NAN`, `HELMCODE_API_KEY`) | file presence-only, otherwise provider's `/v1/models` |
  * | `pi`             | auth.json (file) → provider API keys, including model-specific keys   | file/model-specific key presence-only, otherwise provider's `/v1/models` |
  * | `acp`            | target-specific (the ACP target process owns its own auth)              | presence-only (validated by the target process) |
  * | `pi` (bedrock)   | `MODEL_OVERRIDE=amazon-bedrock/*` → AWS SDK default credential chain    | presence-only (real check is the worker-side Bedrock enumeration) |
@@ -459,17 +494,28 @@ export async function validateProviderCredentials(
         // decision, including any injected filesystem probe used by reports.
         if (status.ready && status.satisfiedBy === "file") return presenceCheckOk();
         // Preserve the live-probe order for supported env keys:
-        // OPENROUTER → ANTHROPIC → OPENAI.
+        // OPENROUTER → ANTHROPIC → OPENAI, then the OpenAI-compatible
+        // registry providers in declaration order (NaN, canonical key or
+        // alias → Helmcode) at their `<ID>_BASE_URL`, so existing env
+        // combinations keep their probe.
         if (env.OPENROUTER_API_KEY) return checkOpenRouter(env.OPENROUTER_API_KEY);
         if (env.ANTHROPIC_API_KEY) return checkAnthropicApiKey(env.ANTHROPIC_API_KEY);
         if (env.OPENAI_API_KEY) return checkOpenAiApiKey(env.OPENAI_API_KEY);
+        for (const direct of openAICompatibleProviders()) {
+          const key = providerKeyFromEnv(direct, env);
+          if (key) {
+            return checkOpenAICompatibleProvider(direct, key, providerBaseUrl(direct, env));
+          }
+        }
         // Model-specific keys (e.g. GEMINI_API_KEY) can satisfy readiness
         // without a probeable endpoint. The harness validates them at inference.
         if (status.ready) return presenceCheckOk();
         return {
           ok: false,
-          error:
-            "No usable credential found (OPENROUTER_API_KEY, ANTHROPIC_API_KEY, or OPENAI_API_KEY).",
+          error: `No usable credential found (OPENROUTER_API_KEY, ANTHROPIC_API_KEY, OPENAI_API_KEY, ${openAICompatibleProviders()
+            .map((p) => p.envVar)
+            .join(", ")
+            .replace(/, (?=[^,]*$)/, ", or ")}).`,
           latency_ms: Date.now() - startedAt,
         };
       }