ns-omp-provider-kiro 0.1.2 → 0.1.4

package/README.md

@@ -2,12 +2,23 @@
 
 Kiro (AWS CodeWhisperer/Q) models in [OMP](https://github.com/can1357/oh-my-pi).
 
-Published on npm as `ns-omp-provider-kiro` — but OMP installs plugins from a
-local path, not a registry name, so install from a clone of
-[ns-kiro-provider](https://github.com/ngosangns/ns-kiro-provider):
+Published on npm as `ns-omp-provider-kiro`:
 
 ```bash
-pnpm install && pnpm -r build
+omp plugin install ns-omp-provider-kiro
+```
+
+Pin a version with `omp plugin install ns-omp-provider-kiro@0.1.2` — bare
+names, scoped names, and `name@version` all resolve as npm specs.
+
+### From a local build
+
+To build from a clone instead — for developing this package or
+`ns-kiro-core` before a release — install from the path:
+
+```bash
+git clone git@github.com:ngosangns/ns-kiro-provider.git
+cd ns-kiro-provider && pnpm install && pnpm -r build
 omp plugin install ./packages/omp-provider-kiro
 ```
 

package/dist/index.js

@@ -4475,7 +4475,9 @@ function toOmpModelConfig(model) {
     input: [...model.input],
     cost: { ...model.cost },
     contextWindow: model.contextWindow,
-    maxTokens: model.maxTokens
+    maxTokens: model.maxTokens,
+    kiroModelId: model.kiroModelId,
+    ...model.additionalModelRequestFieldsSchema ? { additionalModelRequestFieldsSchema: model.additionalModelRequestFieldsSchema } : {}
   };
 }
 function kiroBaseUrl(region) {
@@ -4565,13 +4567,18 @@ var ZERO_USAGE = () => ({
   totalTokens: 0,
   cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
 });
-function toKiroModel(model, catalog) {
-  const region = model.kiroRegion ?? getKiroRegionFromEndpoint(model.baseUrl) ?? "us-east-1";
-  const known = catalog.find((candidate) => candidate.id === model.id);
+function toKiroModel(model, region) {
+  const known = getCachedModels(region).find((candidate) => candidate.id === model.id);
   return {
     ...known ?? {
       id: model.id,
-      kiroModelId: model.kiroModelId ?? model.id,
+      // No fallback to `model.id`: that dash-spelled local id is not a valid
+      // Kiro wire id. Falls back to `""` rather than `model.id` — falsy, so
+      // `resolveKiroModel`'s `if (exactKiroModelId) return exactKiroModelId`
+      // treats it as no override and runs its own cache/bootstrap/dot-normalize
+      // resolution instead of being short-circuited by a value that is really
+      // just `model.id` again.
+      kiroModelId: model.kiroModelId ?? "",
       name: model.name,
       reasoning: model.reasoning,
       input: [...model.input],
@@ -4608,8 +4615,9 @@ function streamKiroForOmp(model, context, options) {
         return contentIndex;
       };
       const at = (coreIndex) => indexes.get(coreIndex);
+      const region = model.kiroRegion ?? getKiroRegionFromEndpoint(model.baseUrl) ?? credentials.region;
       for await (const event of streamKiro({
-        model: toKiroModel(model, kiroModels),
+        model: toKiroModel(model, region),
         messages: toKiroMessages(context.messages),
         systemPrompt: context.systemPrompt?.join("\n\n"),
         tools: toKiroTools(context.tools),
@@ -4850,10 +4858,8 @@ function index_default(pi) {
             api: "kiro-api",
             provider: "kiro",
             baseUrl: kiroBaseUrl(region),
-            kiroModelId: model.kiroModelId,
             kiroRegion: region,
-            ...kiroCredentials.profileArn ? { kiroProfileArn: kiroCredentials.profileArn } : {},
-            ...model.additionalModelRequestFieldsSchema ? { additionalModelRequestFieldsSchema: model.additionalModelRequestFieldsSchema } : {}
+            ...kiroCredentials.profileArn ? { kiroProfileArn: kiroCredentials.profileArn } : {}
           })
         );
         return [...others, ...kiro];

package/dist/models.d.ts

@@ -15,6 +15,16 @@ export interface OmpKiroModelConfig {
     };
     contextWindow: number;
     maxTokens: number;
+    /**
+     * Wire id Kiro accepts, when it differs from {@link id}. Registration and
+     * dynamic-discovery models carry no per-credential region or profile, but
+     * request time still needs the exact catalog id — a model absent from
+     * kiro-core's bootstrap list would otherwise fall back to guessing the wire
+     * id from the dash-spelled local `id`, which Kiro rejects as `INVALID_MODEL_ID`.
+     */
+    kiroModelId: string;
+    /** Catalog schema this model's structured effort/thinking fields derive from. */
+    additionalModelRequestFieldsSchema?: Record<string, unknown>;
 }
 export declare function toOmpModelConfig(model: KiroModel): OmpKiroModelConfig;
 export declare function kiroBaseUrl(region: string): string;

package/dist/stream.d.ts

@@ -1,2 +1,24 @@
 import type { Api, AssistantMessageEventStream, Context, Model, SimpleStreamOptions } from "@oh-my-pi/pi-ai";
+import { type KiroModel } from "ns-kiro-core";
+/** Catalog metadata this provider attaches to the models it registers. */
+export type KiroBackedModel = Model<Api> & {
+    kiroModelId?: string;
+    kiroRegion?: string;
+    kiroProfileArn?: string;
+    additionalModelRequestFieldsSchema?: Record<string, unknown>;
+};
+/**
+ * Rebuild the core's model descriptor from what OMP hands back at request time.
+ *
+ * OMP's registry keeps its own `Model`, built from the config this provider
+ * registered, so the catalog entry is looked up again here rather than carried
+ * through: the ladder and the request-fields schema decide effort mapping, and
+ * a request must use the same ones the catalog advertised.
+ *
+ * Looks up the region's authenticated cache, not the static bootstrap list:
+ * models discovered only through the authenticated catalog (no bootstrap
+ * entry) would otherwise miss this lookup and fall through to guessing a wire
+ * id from the dash-spelled local `id`, which Kiro rejects as `INVALID_MODEL_ID`.
+ */
+export declare function toKiroModel(model: KiroBackedModel, region: string): KiroModel;
 export declare function streamKiroForOmp(model: Model<Api>, context: Context, options?: SimpleStreamOptions): AssistantMessageEventStream;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider-kiro",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "OMP (oh-my-pi) provider plugin: adds Kiro (AWS CodeWhisperer/Q) models via your kiro-cli login",
   "type": "module",
   "main": "./dist/index.js",
@@ -36,8 +36,13 @@
     "dist",
     "README.md"
   ],
+  "scripts": {
+    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --banner:js=\"import{createRequire as __kiroCreateRequire}from'node:module';const require=__kiroCreateRequire(import.meta.url);\" --external:@oh-my-pi/pi-ai --external:@oh-my-pi/pi-catalog --external:@oh-my-pi/pi-coding-agent --external:@oh-my-pi/pi-tui && tsc -p tsconfig.json --emitDeclarationOnly",
+    "check": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.test.json",
+    "prepublishOnly": "pnpm run check && pnpm run build"
+  },
   "dependencies": {
-    "ns-kiro-core": "0.1.2"
+    "ns-kiro-core": "workspace:*"
   },
   "peerDependencies": {
     "@oh-my-pi/pi-ai": ">=18.1.0",
@@ -55,9 +60,5 @@
     "@oh-my-pi/pi-ai": "18.1.5",
     "@oh-my-pi/pi-coding-agent": "18.1.5",
     "@types/node": "^22.10.0"
-  },
-  "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --banner:js=\"import{createRequire as __kiroCreateRequire}from'node:module';const require=__kiroCreateRequire(import.meta.url);\" --external:@oh-my-pi/pi-ai --external:@oh-my-pi/pi-catalog --external:@oh-my-pi/pi-coding-agent --external:@oh-my-pi/pi-tui && tsc -p tsconfig.json --emitDeclarationOnly",
-    "check": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.test.json"
   }
-}
+}

package/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2026 ngosangns
-Copyright (c) 2025-2026 Mike O'Brien (pi-provider-kiro)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.