ns-omp-provider 0.1.0 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.3.0
+
+- **Breaking: `kiro` is now opt-in.** By default only `devin` and `grok` (+ `grok-sdk`)
+  are registered, so this package no longer shadows the dedicated
+  [`ns-omp-provider-kiro`](https://www.npmjs.com/package/ns-omp-provider-kiro) plugin
+  (the recommended Kiro path in OMP). Opt in with `NS_OMP_PROVIDER_ENABLE=kiro` or by
+  listing it in `NS_OMP_PROVIDERS` (e.g. `NS_OMP_PROVIDERS=devin,grok,kiro`).
+  `NS_OMP_PROVIDER_DISABLE` still works and is applied last; the old
+  `NS_OMP_PROVIDER_DISABLE=kiro` workaround is no longer needed.
+- Bundles `@ngosangns/ns-pi-provider@0.2.1`: Kiro now honours `metadataEvent` stop
+  reasons — `MAX_TOKENS` → `length` (OMP skips truncated tool calls instead of running
+  them with partial arguments), `CONTENT_FILTERED` / `MODEL_CONTEXT_WINDOW_EXCEEDED` /
+  `PAUSE_TURN` and mid-stream exception frames end as errors, and reported token usage
+  is read. Only relevant when `kiro` is opted in.
+
+## 0.2.0
+
+Bundles `@ngosangns/ns-pi-provider@0.2.0` (was 0.1.7).
+
+- **Breaking (kiro):** the Kiro catalog now comes only from `ListAvailableModels`.
+  Without a Kiro credential or a saved catalog snapshot the `kiro` provider
+  registers with zero models, and derived `-1m` variants (e.g.
+  `claude-sonnet-4-6-1m`) are gone. Wire model ids are sent in Kiro's dot form
+  (`claude-sonnet-4.5`), fixing `INVALID_MODEL_ID` on discovered models. Users
+  with `NS_OMP_PROVIDER_DISABLE=kiro` are unaffected.
+- fix(grok): `session_shutdown` disposes only that session's Grok ACP agent
+  (upstream pi-grok-sdk `45fde95`); switching or closing one session no longer
+  kills other sessions' agents, and one process-exit hook is installed per
+  process instead of per registration.
+- No compat-shim changes needed: 0.2.0 adds no new `@earendil-works/pi-ai`
+  runtime imports.
+
 ## 0.1.0
 
 - Initial release: OMP wrapper around `@ngosangns/ns-pi-provider` 0.1.7.

package/README.md

@@ -10,7 +10,7 @@ compat layer.
 
 | Provider | Auth | Notes |
 |----------|------|-------|
-| `kiro` | OAuth (`/login kiro`) + `KIRO_API_KEY` / SSO cache | Overlaps with [`ns-omp-provider-kiro`](https://www.npmjs.com/package/ns-omp-provider-kiro) — see below |
+| `kiro` (**opt-in**) | OAuth (`/login kiro`) + `KIRO_API_KEY` / SSO cache | Off by default — use [`ns-omp-provider-kiro`](https://www.npmjs.com/package/ns-omp-provider-kiro); see below |
 | `devin` | OAuth (`/login devin`) + `credentials.toml` / env | Swe-2 catalog when authenticated |
 | `grok` (+ `grok-sdk` alias) | Local `grok` CLI / `~/.grok` / `XAI_API_KEY` | Commands: `/grok status \| models \| refresh` |
 
@@ -19,7 +19,7 @@ Shared command: `/ns-pi status | refresh [all\|kiro\|devin\|grok]`.
 ## Install
 
 ```bash
-# from npm (after first publish)
+# from npm
 omp plugin install ns-omp-provider
 
 # from git
@@ -36,17 +36,24 @@ omp -e ./dist/index.js ...
 Then `/login kiro` or `/login devin` as needed. Grok uses the local `grok`
 CLI / `~/.grok` auth (or `XAI_API_KEY`).
 
-### Avoiding a duplicate `kiro` provider
+### Choosing providers (`kiro` is opt-in)
 
-If you already use [`ns-omp-provider-kiro`](https://www.npmjs.com/package/ns-omp-provider-kiro),
-disable this package's kiro registration:
+By default this package registers **`devin`** and **`grok`** (+ `grok-sdk`) only.
+For Kiro in OMP, the recommended path is the dedicated
+[`ns-omp-provider-kiro`](https://www.npmjs.com/package/ns-omp-provider-kiro) plugin;
+this package's `kiro` stays off so it never shadows that plugin.
 
 ```bash
-# in the shell that launches omp, or via your shell profile / omp env
-export NS_OMP_PROVIDER_DISABLE=kiro
+# opt in to this package's kiro (in the environment that launches omp)
+export NS_OMP_PROVIDER_ENABLE=kiro
+# or allow-list exactly what you want
+export NS_OMP_PROVIDERS=devin,grok,kiro
+# deny-list, applied last (e.g. drop grok)
+export NS_OMP_PROVIDER_DISABLE=grok
 ```
 
-Or allow-list only what you want: `NS_OMP_PROVIDERS=devin,grok`.
+Don't opt in to `kiro` while `ns-omp-provider-kiro` is installed — both would
+register the same `kiro` provider id.
 
 ## How the wrapper works
 
@@ -72,12 +79,16 @@ Or allow-list only what you want: `NS_OMP_PROVIDERS=devin,grok`.
 
 - **`session_info_changed`** — OMP has no equivalent; the grok handler is a
   documented no-op (name changes do not re-key the agent pool).
-- **Duplicate `kiro`** — see `NS_OMP_PROVIDER_DISABLE` above.
+- **Duplicate `kiro`** — `kiro` is opt-in; don't enable it alongside `ns-omp-provider-kiro`.
 - **Unauthenticated catalogs** — without credentials, OMP may hide a provider's
   models from `omp models` even though the provider is registered. After
   `/login` (or with CLI creds present) the live catalog, including Devin
   `swe-2-*`, appears via `fetchDynamicModels`.
-- **Upstream pin** — this release bundles `@ngosangns/ns-pi-provider@0.1.7`.
+- **Kiro catalog** (when opted in) — models come only from Kiro's `ListAvailableModels`
+  (since ns-pi-provider 0.2.0): with no Kiro credential and no saved catalog
+  snapshot, `kiro` registers zero models, and `-1m` long-context variants are
+  not offered.
+- **Upstream pin** — this release bundles `@ngosangns/ns-pi-provider@0.2.1`.
   Bumping it is a deliberate change (rebuild + retest).
 
 ## Development
@@ -95,14 +106,14 @@ your real `~/.omp`.
 
 ## Publish
 
-Push a tag matching `package.json` (e.g. `v0.1.0`) to run
+Push a tag matching `package.json` (e.g. `v0.3.0`) to run
 [`.github/workflows/publish.yml`](.github/workflows/publish.yml), which
 publishes with **provenance** from a GitHub-hosted runner:
 
 ```bash
 # bump "version" in package.json first, then
 npm run check
-git tag v0.1.0 && git push origin v0.1.0
+git tag v0.3.0 && git push origin v0.3.0
 ```
 
 Auth, in the order npm tries it:

package/dist/config.d.ts

@@ -3,8 +3,17 @@ export declare const PROVIDER_KEYS: readonly ["kiro", "devin", "grok"];
 export type ProviderKey = (typeof PROVIDER_KEYS)[number];
 export type ProviderSelection = Record<ProviderKey, boolean>;
 /**
- * - `NS_OMP_PROVIDERS=devin,grok` — allow-list (only these are registered).
- * - `NS_OMP_PROVIDER_DISABLE=kiro` — deny-list, applied after the allow-list.
- * Default: all three.
+ * Providers that stay off unless explicitly requested. `kiro` is opt-in because
+ * the dedicated `ns-omp-provider-kiro` plugin is the recommended Kiro path in
+ * OMP; registering a second `kiro` here would shadow it.
+ */
+export declare const OPT_IN_PROVIDERS: ReadonlySet<ProviderKey>;
+/**
+ * - `NS_OMP_PROVIDERS=devin,grok,kiro` — allow-list (only these are registered;
+ *   listing `kiro` here opts it in).
+ * - `NS_OMP_PROVIDER_ENABLE=kiro` — opt in to opt-in providers on top of the
+ *   default set (or the allow-list).
+ * - `NS_OMP_PROVIDER_DISABLE=grok` — deny-list, applied last.
+ * Default: `devin` and `grok`; `kiro` is opt-in.
  */
 export declare function resolveProviderSelection(env?: NodeJS.ProcessEnv): ProviderSelection;

package/dist/index.js

@@ -1,4 +1,4 @@
-// ns-omp-provider 0.1.0 — bundles @ngosangns/ns-pi-provider@0.1.7 (MIT). See NOTICE.
+// ns-omp-provider 0.3.0 — bundles @ngosangns/ns-pi-provider@0.2.1 (MIT). See NOTICE.
 import { createRequire as __nsOmpCreateRequire } from 'node:module';
 const require = __nsOmpCreateRequire(import.meta.url);
 var __defProp = Object.defineProperty;
@@ -696,9 +696,10 @@ function omitInternalKiroHeaders(headers) {
   return Object.keys(filtered).length > 0 ? filtered : void 0;
 }
 function buildRequest(model, context, config, options) {
-  const { history, currentMessage } = convertMessages(context, model.id);
+  const wireModelId = model.id.replace(/(\d)-(\d)/g, "$1.$2");
+  const { history, currentMessage } = convertMessages(context, wireModelId);
   const firstContent = firstUserConversationContent(history, currentMessage);
-  prependSystemInstructionHistory(history, buildSystemPrefix(context), model.id);
+  prependSystemInstructionHistory(history, buildSystemPrefix(context), wireModelId);
   const amazonQEndpoint = isAmazonQEndpoint(config);
   if (amazonQEndpoint) setUserMessageOrigin(history, currentMessage, "KIRO_CLI");
   const profileArn = getHeaderCaseInsensitive(options?.headers, KIRO_PROFILE_ARN_HEADER) ?? config.profileArn;
@@ -881,6 +882,65 @@ function buildUsage(model, tokens) {
   calculateCost(model, usage);
   return usage;
 }
+function optionalCount(value2) {
+  return typeof value2 === "number" && Number.isFinite(value2) && value2 >= 0 ? value2 : void 0;
+}
+function firstCount(record2, keys) {
+  for (const key of keys) {
+    const value2 = optionalCount(record2[key]);
+    if (value2 !== void 0) return value2;
+  }
+  return void 0;
+}
+function applyKiroMetadata(state2, model, payload) {
+  const metadata = isRecord(payload.metadataEvent) ? payload.metadataEvent : payload;
+  const stopReason = nonEmptyString(metadata.stopReason);
+  if (stopReason) state2.wireStopReason = stopReason;
+  if (isRecord(metadata.stopDetails)) state2.wireStopDetails = metadata.stopDetails;
+  const tokenUsage = isRecord(metadata.tokenUsage) ? metadata.tokenUsage : void 0;
+  if (!tokenUsage) return;
+  const percentage2 = numberFrom(tokenUsage.contextUsagePercentage);
+  if (percentage2 > 0) state2.contextUsagePercentage = percentage2;
+  const next = {
+    input: optionalCount(tokenUsage.uncachedInputTokens) ?? optionalCount(tokenUsage.inputTokens),
+    output: optionalCount(tokenUsage.outputTokens),
+    cacheRead: firstCount(tokenUsage, CACHE_READ_KEYS),
+    cacheWrite: firstCount(tokenUsage, CACHE_WRITE_KEYS)
+  };
+  const merged = { ...state2.wireTokens ?? {} };
+  for (const [key, value2] of Object.entries(next)) {
+    if (value2 !== void 0) merged[key] = value2;
+  }
+  state2.wireTokens = merged;
+  const tokens = { input: merged.input ?? 0, output: merged.output ?? 0, cacheRead: merged.cacheRead ?? 0, cacheWrite: merged.cacheWrite ?? 0 };
+  if (tokens.input > 0 || tokens.output > 0 || tokens.cacheRead > 0 || tokens.cacheWrite > 0) {
+    state2.usage = buildUsage(model, tokens);
+  }
+}
+function clampForDiagnostic(text2) {
+  return text2.length <= DIAGNOSTIC_QUOTE_LIMIT ? text2 : `${text2.slice(0, DIAGNOSTIC_QUOTE_LIMIT)}\u2026 (truncated)`;
+}
+function throwOnTerminalWireStop(state2) {
+  switch (state2.wireStopReason) {
+    case "MODEL_CONTEXT_WINDOW_EXCEEDED":
+      throw new Error("Kiro API error: context_length_exceeded (MODEL_CONTEXT_WINDOW_EXCEEDED): the model context window exceeded its limit");
+    case "CONTENT_FILTERED":
+      throw new Error(`Kiro content filtered (CONTENT_FILTERED): ${clampForDiagnostic(redactSensitiveString(JSON.stringify(state2.wireStopDetails ?? {})))}`);
+    case "PAUSE_TURN":
+      throw new Error("Kiro paused the turn (PAUSE_TURN); automatic continuation is not supported");
+  }
+}
+function resolveStopReason(state2) {
+  if (state2.wireStopReason === "MAX_TOKENS") return "length";
+  return state2.hasToolCalls ? "toolUse" : "stop";
+}
+function throwOnExceptionFrame(headers, payload) {
+  const messageType = headers[":message-type"];
+  if (messageType !== "exception" && messageType !== "error") return;
+  const kind = headers[":exception-type"] ?? headers[":error-code"] ?? "error";
+  const message2 = (payload ? nonEmptyString(payload.message) ?? nonEmptyString(payload.Message) ?? nonEmptyString(payload.error) : void 0) ?? headers[":error-message"] ?? "";
+  throw new Error(`Kiro stream ${kind}: ${clampForDiagnostic(redactSensitiveString(message2 || "no details"))}`);
+}
 function usageFromMetrics(model, metrics) {
   const input = numberFrom(metrics.inputTokens);
   const output = numberFrom(metrics.outputTokens);
@@ -1064,6 +1124,10 @@ function handleEvent(stream, output, state2, model, eventType, payload) {
     if (percentage2 > 0) state2.contextUsagePercentage = percentage2;
     return;
   }
+  if (eventType === "metadataEvent") {
+    applyKiroMetadata(state2, model, payload);
+    return;
+  }
   if (eventType === "metricsEvent") {
     const metrics = isRecord(payload.metricsEvent) ? payload.metricsEvent : payload;
     state2.usage = usageFromMetrics(model, metrics);
@@ -1091,15 +1155,17 @@ async function consumeKiroEventStream(response, stream, output, model, logger) {
       if (!frameBytes) break;
       const frame = parseEventFrame(frameBytes, logger);
       if (!frame) continue;
+      throwOnExceptionFrame(frame.headers, frame.payload);
       handleEvent(stream, output, state2, model, frame.headers[":event-type"] ?? "", frame.payload);
     }
     if (iterations >= 1e3) logger.warn("eventstream_iteration_limit_reached", { remainingBytes: queue.length });
   }
+  throwOnTerminalWireStop(state2);
   closeThinkingBlock(stream, output, state2);
   closeTextBlock(stream, output, state2);
   closeToolCalls(stream, output, state2);
   output.usage = state2.usage ?? estimatedUsage(model, state2) ?? output.usage;
-  output.stopReason = state2.hasToolCalls ? "toolUse" : "stop";
+  output.stopReason = resolveStopReason(state2);
   stream.push({ type: "done", reason: output.stopReason, message: output });
   stream.end(output);
 }
@@ -1146,7 +1212,7 @@ function createKiroStream(config, _runtime, logger) {
     return stream;
   };
 }
-var ENV_VAR_PATTERN, DEFAULT_MAX_OUTPUT_TOKENS, API_MAX_OUTPUT_TOKENS, KIRO_NAMESPACE, KIRO_STREAMING_TARGET, KIRO_CODEWHISPERER_SDK_USER_AGENT, KIRO_CODEWHISPERER_AMZ_USER_AGENT, KIRO_Q_SDK_USER_AGENT, KIRO_Q_AMZ_USER_AGENT, KIRO_CLI_CONTEXT_BLOCK_PATTERN, KIRO_CLI_USER_MESSAGE_PATTERN, KiroAuthFailureError;
+var ENV_VAR_PATTERN, DEFAULT_MAX_OUTPUT_TOKENS, API_MAX_OUTPUT_TOKENS, KIRO_NAMESPACE, KIRO_STREAMING_TARGET, KIRO_CODEWHISPERER_SDK_USER_AGENT, KIRO_CODEWHISPERER_AMZ_USER_AGENT, KIRO_Q_SDK_USER_AGENT, KIRO_Q_AMZ_USER_AGENT, KIRO_CLI_CONTEXT_BLOCK_PATTERN, KIRO_CLI_USER_MESSAGE_PATTERN, KiroAuthFailureError, CACHE_READ_KEYS, CACHE_WRITE_KEYS, DIAGNOSTIC_QUOTE_LIMIT;
 var init_stream_oauth = __esm({
   "node_modules/@ngosangns/ns-pi-provider/src/kiro/stream-oauth.ts"() {
     init_pi_ai();
@@ -1173,6 +1239,9 @@ var init_stream_oauth = __esm({
         this.kiroAuth = { ...metadata };
       }
     };
+    CACHE_READ_KEYS = ["cacheReadInputTokens", "cache_read_input_tokens", "cacheReadTokens"];
+    CACHE_WRITE_KEYS = ["cacheWriteInputTokens", "cache_creation_input_tokens", "cacheCreationInputTokens", "cacheCreationTokens"];
+    DIAGNOSTIC_QUOTE_LIMIT = 500;
   }
 });
 
@@ -1368,9 +1437,6 @@ import { readFileSync as readFileSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 var KIRO_API = "kiro";
 var KIRO_MAX_OUTPUT_TOKENS = 32e3;
-var KIRO_PROMPT_CACHING_1024 = { supportsPromptCaching: true, maximumCacheCheckpointsPerRequest: 4, minimumTokensPerCacheCheckpoint: 1024 };
-var KIRO_PROMPT_CACHING_4096 = { supportsPromptCaching: true, maximumCacheCheckpointsPerRequest: 4, minimumTokensPerCacheCheckpoint: 4096 };
-var KIRO_PROMPT_CACHING_DISABLED = { supportsPromptCaching: false };
 var ANTHROPIC_REASONING_MAP = { off: "disabled", minimal: "low", low: "low", medium: "medium", high: "high", xhigh: null };
 var ANTHROPIC_OPUS_4_7_REASONING_MAP = { ...ANTHROPIC_REASONING_MAP, xhigh: "xhigh" };
 var ANTHROPIC_MAX_REASONING_MAP = { ...ANTHROPIC_REASONING_MAP, xhigh: "max" };
@@ -1380,21 +1446,6 @@ function defaultThinkingLevelMapForModel(id, name) {
   if (/claude[-\s_/]*(?:opus|sonnet)[-\s_/]*4[.-]?6\b/.test(identity)) return { ...ANTHROPIC_MAX_REASONING_MAP };
   return void 0;
 }
-var DEFAULT_MODELS = [
-  { id: "auto", name: "Auto", reasoning: true, contextWindow: 1e6, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 1, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_1024, importOwnership: "model-discovery" },
-  { id: "claude-opus-4.7", name: "Claude Opus 4.7", reasoning: true, thinkingLevelMap: ANTHROPIC_OPUS_4_7_REASONING_MAP, contextWindow: 1e6, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 2.2, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_4096, importOwnership: "model-discovery" },
-  { id: "claude-opus-4.6", name: "Claude Opus 4.6", reasoning: true, thinkingLevelMap: ANTHROPIC_MAX_REASONING_MAP, contextWindow: 1e6, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 2.2, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_4096, importOwnership: "model-discovery" },
-  { id: "claude-sonnet-4.6", name: "Claude Sonnet 4.6", reasoning: true, thinkingLevelMap: ANTHROPIC_MAX_REASONING_MAP, contextWindow: 1e6, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 1.3, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_1024, importOwnership: "model-discovery" },
-  { id: "claude-opus-4.5", name: "Claude Opus 4.5", reasoning: true, contextWindow: 2e5, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 2.2, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_4096, importOwnership: "model-discovery" },
-  { id: "claude-sonnet-4.5", name: "Claude Sonnet 4.5", reasoning: true, contextWindow: 2e5, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 1.3, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_1024, importOwnership: "model-discovery" },
-  { id: "claude-sonnet-4", name: "Claude Sonnet 4", reasoning: true, contextWindow: 2e5, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 1.3, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_1024, importOwnership: "model-discovery" },
-  { id: "claude-haiku-4.5", name: "Claude Haiku 4.5", reasoning: true, contextWindow: 2e5, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.4, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_4096, importOwnership: "model-discovery" },
-  { id: "deepseek-3.2", name: "DeepSeek 3.2", reasoning: true, contextWindow: 164e3, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.25, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_DISABLED, importOwnership: "model-discovery" },
-  { id: "minimax-m2.5", name: "MiniMax M2.5", reasoning: true, contextWindow: 196e3, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.25, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_DISABLED, importOwnership: "model-discovery" },
-  { id: "minimax-m2.1", name: "MiniMax M2.1", reasoning: true, contextWindow: 196e3, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.15, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_DISABLED, importOwnership: "model-discovery" },
-  { id: "glm-5", name: "GLM-5", reasoning: true, contextWindow: 2e5, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.5, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_DISABLED, importOwnership: "model-discovery" },
-  { id: "qwen3-coder-next", name: "Qwen3 Coder Next", reasoning: true, contextWindow: 256e3, maxTokens: KIRO_MAX_OUTPUT_TOKENS, rateMultiplier: 0.05, rateUnit: "Credit", promptCaching: KIRO_PROMPT_CACHING_DISABLED, importOwnership: "model-discovery" }
-];
 var DEFAULT_MODEL_DEFAULTS = {
   reasoning: true,
   input: ["text"],
@@ -1602,11 +1653,7 @@ function loadConfig(extensionRoot) {
   const warnings = [];
   const raw = readRawConfig(extensionRoot, warnings);
   const defaults = modelDefaultsFrom(raw, warnings);
-  const models = normalizeModelList(Array.isArray(raw.models) ? raw.models : DEFAULT_MODELS, defaults, warnings);
-  if (models.length === 0) {
-    warnings.push("No valid models were configured; using the default Kiro model list.");
-    models.push(...normalizeModelList(DEFAULT_MODELS, defaults, warnings));
-  }
+  const models = normalizeModelList(Array.isArray(raw.models) ? raw.models : [], defaults, warnings);
   const upstreamUrl = stringOr(raw.upstreamUrl, "https://codewhisperer.us-east-1.amazonaws.com/generateAssistantResponse");
   return {
     config: {
@@ -2273,244 +2320,20 @@ var log = {
   isDebug: () => enabled("debug")
 };
 
-// node_modules/@ngosangns/ns-pi-provider/src/kiro/transform.ts
-var KIRO_ORIGIN = "AI_EDITOR";
-
-// node_modules/@ngosangns/ns-pi-provider/src/kiro/models.ts
-var discoveredModelIds = /* @__PURE__ */ new Set();
-function setDiscoveredModelIds(kiroIds) {
-  discoveredModelIds.clear();
-  for (const id of kiroIds) discoveredModelIds.add(id);
-}
-var BASE_URL = "https://q.us-east-1.amazonaws.com/";
-var ZERO_COST = Object.freeze({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
-var KIRO_DEFAULTS = {
-  api: "kiro-api",
-  provider: "kiro",
-  baseUrl: BASE_URL,
-  cost: ZERO_COST
-};
-var MULTIMODAL = ["text", "image"];
-var TEXT_ONLY = ["text"];
-var kiroModels = [
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-opus-4-8",
-    name: "Claude Opus 4.8",
-    reasoning: true,
-    reasoningHidden: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 128e3,
-    firstTokenTimeout: 18e4
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-opus-4-7",
-    name: "Claude Opus 4.7",
-    reasoning: true,
-    reasoningHidden: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 128e3,
-    firstTokenTimeout: 18e4
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-opus-4-6",
-    name: "Claude Opus 4.6",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 32768
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-opus-4-6-1m",
-    name: "Claude Opus 4.6 (1M)",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 32768
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-sonnet-4-6",
-    name: "Claude Sonnet 4.6",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-sonnet-4-6-1m",
-    name: "Claude Sonnet 4.6 (1M)",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-opus-4-5",
-    name: "Claude Opus 4.5",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 32768
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-sonnet-4-5",
-    name: "Claude Sonnet 4.5",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-sonnet-4-5-1m",
-    name: "Claude Sonnet 4.5 (1M)",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-sonnet-4",
-    name: "Claude Sonnet 4",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "claude-haiku-4-5",
-    name: "Claude Haiku 4.5",
-    reasoning: false,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "deepseek-3-2",
-    name: "DeepSeek 3.2",
-    reasoning: true,
-    input: TEXT_ONLY,
-    contextWindow: 128e3,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "kimi-k2-5",
-    name: "Kimi K2.5",
-    reasoning: true,
-    input: TEXT_ONLY,
-    contextWindow: 2e5,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "minimax-m2-5",
-    name: "MiniMax M2.5",
-    reasoning: false,
-    input: TEXT_ONLY,
-    contextWindow: 2e5,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "minimax-m2-1",
-    name: "MiniMax M2.1",
-    reasoning: false,
-    input: TEXT_ONLY,
-    contextWindow: 2e5,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "glm-4-7",
-    name: "GLM 4.7",
-    reasoning: true,
-    input: TEXT_ONLY,
-    contextWindow: 128e3,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "glm-4-7-flash",
-    name: "GLM 4.7 Flash",
-    reasoning: false,
-    input: TEXT_ONLY,
-    contextWindow: 128e3,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "qwen3-coder-next",
-    name: "Qwen3 Coder Next",
-    reasoning: true,
-    input: TEXT_ONLY,
-    contextWindow: 256e3,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "qwen3-coder-480b",
-    name: "Qwen3 Coder 480B",
-    reasoning: true,
-    input: TEXT_ONLY,
-    contextWindow: 128e3,
-    maxTokens: 8192
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "agi-nova-beta-1m",
-    name: "AGI Nova Beta (1M)",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 1e6,
-    maxTokens: 65536
-  },
-  {
-    ...KIRO_DEFAULTS,
-    id: "auto",
-    name: "Auto",
-    reasoning: true,
-    input: MULTIMODAL,
-    contextWindow: 2e5,
-    maxTokens: 65536
-  }
-];
-
 // node_modules/@ngosangns/ns-pi-provider/src/kiro/discover.ts
+var KIRO_ORIGIN = "AI_EDITOR";
 var LIST_TARGET = "AmazonCodeWhispererService.ListAvailableModels";
 var LIST_TIMEOUT_MS = 15e3;
 function buildUserAgent() {
   const mid = crypto.randomUUID().replace(/-/g, "");
   return `aws-sdk-rust/1.0.0 ua/2.1 os/other lang/rust api/codewhispererstreaming#1.28.3 m/E app/AmazonQ-For-CLI md/appVersion-1.28.3-${mid}`;
 }
-var BEHAVIOR_BY_KIRO_ID = Object.fromEntries(
-  kiroModels.map((m) => [
-    m.id.replace(/(\d)-(\d)/g, "$1.$2"),
-    {
-      ...m.reasoningHidden ? { reasoningHidden: true } : {},
-      ...m.firstTokenTimeout ? { firstTokenTimeout: m.firstTokenTimeout } : {}
-    }
-  ])
-);
-var ONE_M_SUFFIX = "-1m";
-var ONE_M_CONTEXT = 1e6;
 function toPiId(kiroId) {
   return kiroId.replace(/(\d)\.(\d)/g, "$1-$2");
 }
 function toKiroModel(api, baseUrl) {
   const piId = toPiId(api.modelId);
+  const thinkingLevelMap = defaultThinkingLevelMapForModel(piId, api.modelName ?? piId);
   const types = api.supportedInputTypes ?? ["TEXT"];
   const input = types.some((t) => t.toUpperCase() === "IMAGE") ? ["text", "image"] : ["text"];
   return {
@@ -2520,39 +2343,18 @@ function toKiroModel(api, baseUrl) {
     provider: "kiro",
     baseUrl,
     // The API reports no reasoning capability flag. Treat every model as
-    // reasoning-capable: stream.ts gates the `<thinking_mode>` directive on
-    // this, and an unnecessary directive is far cheaper than suppressing
-    // reasoning on a model that supports it.
+    // reasoning-capable: an over-eager `reasoning` flag is far cheaper than
+    // suppressing reasoning on a model that supports it.
     reasoning: true,
     input,
     // Kiro bills in credits via rateMultiplier, not per-token USD. There is
-    // no token price to report, so cost stays zero and the multiplier is
-    // surfaced in the model name instead.
+    // no token price to report, so cost stays zero.
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
     contextWindow: api.tokenLimits?.maxInputTokens ?? 2e5,
     maxTokens: api.tokenLimits?.maxOutputTokens ?? 8192,
-    ...BEHAVIOR_BY_KIRO_ID[api.modelId]
+    ...thinkingLevelMap ? { thinkingLevelMap } : {}
   };
 }
-function deriveLongContextVariants(discovered, baseUrl) {
-  const present = new Set(discovered.map((m) => m.id));
-  const out = [];
-  for (const staticModel of kiroModels) {
-    if (!staticModel.id.endsWith(ONE_M_SUFFIX)) continue;
-    if (present.has(staticModel.id)) continue;
-    const baseId = staticModel.id.slice(0, -ONE_M_SUFFIX.length);
-    const base = discovered.find((m) => m.id === baseId);
-    if (!base) continue;
-    out.push({
-      ...base,
-      id: staticModel.id,
-      name: `${base.name} (1M)`,
-      contextWindow: ONE_M_CONTEXT,
-      ...BEHAVIOR_BY_KIRO_ID[staticModel.id.replace(/(\d)-(\d)/g, "$1.$2")]
-    });
-  }
-  return out;
-}
 async function discoverKiroModels(apiKey, baseUrl, signal) {
   const ua = buildUserAgent();
   const timeout = AbortSignal.timeout(LIST_TIMEOUT_MS);
@@ -2606,13 +2408,10 @@ async function discoverKiroModels(apiKey, baseUrl, signal) {
       "Kiro model discovery returned no models for this API key. The key may lack model entitlements, or be scoped to another region."
     );
   }
-  const discovered = apiModels.filter((m) => typeof m.modelId === "string" && m.modelId.length > 0).map((m) => toKiroModel(m, baseUrl));
-  const models = [...discovered, ...deriveLongContextVariants(discovered, baseUrl)];
-  setDiscoveredModelIds(models.map((m) => m.id.replace(/(\d)-(\d)/g, "$1.$2")));
+  const models = apiModels.filter((m) => typeof m.modelId === "string" && m.modelId.length > 0).map((m) => toKiroModel(m, baseUrl));
   log.info("discover.ok", {
     count: models.length,
-    discovered: discovered.map((m) => m.id),
-    derived: models.length - discovered.length,
+    discovered: models.map((m) => m.id),
     defaultModel: payload.defaultModel?.modelId
   });
   return models;
@@ -2817,9 +2616,10 @@ async function refreshKiroModels(options = {}) {
           input: m.input,
           cost: ensureCacheCost(m.cost),
           contextWindow: m.contextWindow,
-          maxTokens: m.maxTokens
+          maxTokens: m.maxTokens,
+          ...m.thinkingLevelMap ? { thinkingLevelMap: m.thinkingLevelMap } : {}
         }));
-        return { models, version: "kiro-list-v1" };
+        return { models, version: "kiro-list-v2" };
       },
       { force: options.force }
     );
@@ -2830,7 +2630,7 @@ async function refreshKiroModels(options = {}) {
     return { models: fallback, fromCache: false };
   }
 }
-function registerKiroProvider(pi) {
+async function registerKiroProvider(pi) {
   const { config, warnings } = loadConfig(EXTENSION_ROOT);
   const logger = new DebugLogger({ extensionRoot: EXTENSION_ROOT, debug: config.debug });
   for (const warning of warnings) logger.warn("config_warning", { warning });
@@ -2858,7 +2658,10 @@ function registerKiroProvider(pi) {
   const runtime = {};
   const streamSimple = createLazyKiroStream(config, runtime, logger);
   const providerHeaders = omitAuthorizationHeaders(config.headers);
-  let currentModels = toProviderModels(fallbackCatalogModels(config), config);
+  let currentModels = toProviderModels(
+    (await refreshKiroModels({ fallback: fallbackCatalogModels(config) })).models,
+    config
+  );
   const buildConfig = (models) => ({
     name: config.displayName || "Kiro",
     baseUrl: config.upstreamUrl,
@@ -3691,14 +3494,14 @@ function formatResetTime(epoch) {
 // node_modules/@ngosangns/ns-pi-provider/src/devin/register.ts
 var DEVIN_PROVIDER_ID = "devin";
 var API = "devin-cloud";
-var BASE_URL2 = "https://server.codeium.com";
+var BASE_URL = "https://server.codeium.com";
 var FALLBACK_MODELS = [
   {
     id: "swe-1-7",
     name: "SWE-1.7",
     api: API,
     provider: DEVIN_PROVIDER_ID,
-    baseUrl: BASE_URL2,
+    baseUrl: BASE_URL,
     reasoning: true,
     input: ["text"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -3710,7 +3513,7 @@ var FALLBACK_MODELS = [
     name: "SWE-1.6",
     api: API,
     provider: DEVIN_PROVIDER_ID,
-    baseUrl: BASE_URL2,
+    baseUrl: BASE_URL,
     reasoning: true,
     input: ["text"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -3738,7 +3541,7 @@ function fromCatalog(models) {
     name: m.name,
     api: m.api || API,
     provider: DEVIN_PROVIDER_ID,
-    baseUrl: m.baseUrl ?? BASE_URL2,
+    baseUrl: m.baseUrl ?? BASE_URL,
     reasoning: m.reasoning ?? true,
     input: m.input ?? ["text"],
     cost: ensureCacheCost(m.cost),
@@ -3813,7 +3616,7 @@ function providerConfig(currentModels, apiKey) {
   return {
     name: "Devin",
     api: API,
-    baseUrl: BASE_URL2,
+    baseUrl: BASE_URL,
     models: currentModels,
     // When CLI credentials.toml (or env) already has a token, set apiKey so Pi
     // marks the provider configured for --list-models without auth.json /login.
@@ -4475,15 +4278,23 @@ var state = {
 };
 var nextGeneration = 1;
 var scopeGenerations = /* @__PURE__ */ new Map([[ANONYMOUS_SCOPE, 0]]);
-var onScopeChange;
 function getSessionCwd() {
   return state.cwd;
 }
 function getSessionScopeKey() {
-  if (state.sessionFile) return state.sessionFile;
-  if (state.sessionId) return `${EPHEMERAL_PREFIX}${state.sessionId}`;
+  return scopeKeyFrom(state.sessionFile, state.sessionId);
+}
+function scopeKeyFrom(sessionFile, sessionId) {
+  if (sessionFile) return sessionFile;
+  if (sessionId) return `${EPHEMERAL_PREFIX}${sessionId}`;
   return ANONYMOUS_SCOPE;
 }
+function scopeKeyFromCtx(ctx) {
+  return scopeKeyFrom(
+    ctx.sessionManager?.getSessionFile?.() ?? void 0,
+    ctx.sessionManager?.getSessionId?.() ?? void 0
+  );
+}
 function setScope(cwd, sessionFile, sessionId) {
   state.cwd = cwd;
   state.sessionFile = sessionFile;
@@ -4491,20 +4302,13 @@ function setScope(cwd, sessionFile, sessionId) {
   state.generation = nextGeneration++;
   scopeGenerations.set(getSessionScopeKey(), state.generation);
 }
-function onSessionScopeKeyChange(handler) {
-  onScopeChange = handler;
-}
 function registerSessionScope(pi) {
   pi.on("session_start", async (_event, ctx) => {
-    const previousScopeKey = getSessionScopeKey();
     setScope(
       ctx.cwd,
       ctx.sessionManager?.getSessionFile?.() ?? void 0,
       ctx.sessionManager?.getSessionId?.() ?? void 0
     );
-    if (previousScopeKey !== getSessionScopeKey()) {
-      await onScopeChange?.(previousScopeKey);
-    }
   });
   pi.on("session_info_changed", async () => {
   });
@@ -5116,6 +4920,7 @@ function streamGrokAgent(model, context, options) {
 }
 
 // node_modules/@ngosangns/ns-pi-provider/src/grok/register.ts
+var exitHookInstalled = false;
 var GROK_PROVIDER_ID = "grok";
 var GROK_SDK_PROVIDER_ID = "grok-sdk";
 var GROK_API = "grok-cli";
@@ -5199,19 +5004,18 @@ function createProviderConfig(models) {
 }
 function registerGrokProvider(pi) {
   registerSessionScope(pi);
-  onSessionScopeKeyChange((previousKey) => {
-    disposeSessionAgentsForScope(previousKey);
+  pi.on("session_shutdown", async (_event, ctx) => {
+    disposeSessionAgentsForScope(scopeKeyFromCtx(ctx));
   });
-  pi.on("session_shutdown", async () => {
-    disposeAllSessionAgents();
-  });
-  const cleanup = () => {
-    try {
-      disposeAllSessionAgents();
-    } catch {
-    }
-  };
-  process.once("exit", cleanup);
+  if (!exitHookInstalled) {
+    exitHookInstalled = true;
+    process.once("exit", () => {
+      try {
+        disposeAllSessionAgents();
+      } catch {
+      }
+    });
+  }
   let binary;
   let binaryError;
   try {
@@ -5294,7 +5098,7 @@ async function registerAllProviders(pi, options = {}) {
   const enableGrok = options.grok !== false;
   if (enableKiro) {
     try {
-      registerKiroProvider(pi);
+      await registerKiroProvider(pi);
     } catch (err) {
       console.warn(
         `[ns-pi-provider] kiro registration failed: ${err instanceof Error ? err.message : String(err)}`
@@ -5460,12 +5264,15 @@ function parseList(value2) {
     value2.split(/[\s,]+/).map((item) => item.trim().toLowerCase()).filter(Boolean)
   );
 }
+var OPT_IN_PROVIDERS = /* @__PURE__ */ new Set(["kiro"]);
 function resolveProviderSelection(env = process.env) {
   const allow = parseList(env.NS_OMP_PROVIDERS);
+  const enable = parseList(env.NS_OMP_PROVIDER_ENABLE) ?? /* @__PURE__ */ new Set();
   const deny = parseList(env.NS_OMP_PROVIDER_DISABLE) ?? /* @__PURE__ */ new Set();
   const selection = {};
   for (const key of PROVIDER_KEYS) {
-    selection[key] = (allow ? allow.has(key) : true) && !deny.has(key);
+    const base = allow ? allow.has(key) : !OPT_IN_PROVIDERS.has(key);
+    selection[key] = (base || enable.has(key)) && !deny.has(key);
   }
   return selection;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "OMP (oh-my-pi) plugin: Kiro, Devin, and Grok providers from @ngosangns/ns-pi-provider, wrapped for OMP's provider/extension API.",
   "type": "module",
   "license": "MIT",
@@ -70,7 +70,7 @@
     }
   },
   "devDependencies": {
-    "@ngosangns/ns-pi-provider": "0.1.7",
+    "@ngosangns/ns-pi-provider": "0.2.1",
     "@types/node": "^22.18.6",
     "esbuild": "^0.28.2",
     "typescript": "^5.9.2",