pi-requesty-discover 1.0.4 → 1.0.6

package/CONTRIBUTING.adoc

@@ -0,0 +1,35 @@
+= Contributing
+
+Thanks for your interest in contributing.
+
+== Useful scripts
+
+These will also be run in the CI/CD pipeline.
+Make sure to run them beforehand to get faster feedback
+about the overall quality.
+
+[source,bash]
+----
+# install all dependencies
+npm install
+
+# linting and format checking all-in-one
+npm run check
+
+# run all the tests
+npm test
+----
+
+Use `npm run format` to fix formatting.
+
+Refer to additional scripts in link:package.json[].
+
+Please keep changes focused and include tests or docs when behavior changes.
+
+Notes:
+
+* The package is loaded directly from TypeScript; do not add a build step casually.
+* Keep implementation in `src/`; root `index.ts` is just the package entrypoint.
+* Edit `README.adoc` if necessary.
+* See `AGENTS.md` for detailed repository conventions.
+* I am pretty good at identifying AI slop 😁.

package/README.adoc

@@ -67,7 +67,7 @@ Example:
     "requesty-export": {
       "name": "Requesty",
       "baseUrl": "https://router.requesty.ai/v1",
-      "apiKey": "rqsty-sk-...",
+      "apiKey": "$REQUESTY_API_KEY",
       "api": "openai-completions",
       "models": []
     }
@@ -78,6 +78,7 @@ Example:
 IMPORTANT: The `apiKey` from `models.json` is not used by this extension.
 It may contain Pi-specific environment-variable substitution that the extension cannot reliably resolve.
 Set `REQUESTY_API_KEY` instead. This variable is required.
+You can configure the real `apiKey` as you like, but it would be recommended to use the same variable as for the model discovery.
 
 IMPORTANT: Health checks are designed to use only a few tokens, but they still make real Requesty API calls and may consume credits.
 

package/README.md

@@ -55,7 +55,7 @@ Example:
     "requesty-export": {
       "name": "Requesty",
       "baseUrl": "https://router.requesty.ai/v1",
-      "apiKey": "rqsty-sk-...",
+      "apiKey": "$REQUESTY_API_KEY",
       "api": "openai-completions",
       "models": []
     }
@@ -67,6 +67,7 @@ Example:
 The `apiKey` from `models.json` is not used by this extension.
 It may contain Pi-specific environment-variable substitution that the extension cannot reliably resolve.
 Set `REQUESTY_API_KEY` instead. This variable is required.
+You can configure the real `apiKey` as you like, but it would be recommended to use the same variable as for the model discovery.
 
 **❗ IMPORTANT**\
 Health checks are designed to use only a few tokens, but they still make real Requesty API calls and may consume credits.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-requesty-discover",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Discover available Requesty models for the Pi Coding Agent",
   "repository": {
     "type": "git",
@@ -22,12 +22,13 @@
     "models"
   ],
   "scripts": {
-    "agent-lint": "agnix . -v",
-    "format:check": "prettier --check src test",
-    "format": "prettier --write src test",
+    "check": "npm run agent-lint && npm run format:check && npm run typecheck && npm run lint",
+    "agent-lint": "agnix . -v --strict",
+    "format:check": "prettier --check .",
+    "format": "prettier --write .",
     "typecheck": "tsc --noEmit",
     "lint": "eslint .",
-    "release": "npm version patch && git push --follow-tags",
+    "release": "read -p 'Release a new version? [y/N] ' ok && [ \"$ok\" = \"y\" ] && npm version patch && git push --follow-tags",
     "test": "vitest run",
     "test:unit": "vitest run src",
     "test:unit:coverage": "vitest run src --coverage",

package/src/env.ts

@@ -1,7 +1,7 @@
-import os from 'node:os'
 import path from 'node:path'
 import process from 'node:process'
 import { prettifyError, z } from 'zod'
+import { getAgentDir } from '@earendil-works/pi-coding-agent'
 
 const HealthCheckModeSchema = z.enum(['off', 'basic', 'full']).default('full')
 
@@ -15,10 +15,6 @@ export type Env = {
 
 export function getEnv(): Env {
   const envVars = process.env
-  const configuredAgentPath = envVars.PI_CODING_AGENT_DIR
-  const defaultAgentPath = path.join(os.homedir(), '.pi', 'agent')
-  const agentPath = configuredAgentPath || defaultAgentPath
-
   const result = HealthCheckModeSchema.safeParse(envVars.REQUESTY_HEALTH_CHECK_MODE)
   if (!result.success) {
     throw new Error(prettifyError(result.error))
@@ -28,7 +24,7 @@ export function getEnv(): Env {
   if (!apiKey) {
     throw new Error(`apiKey must be set via REQUESTY_API_KEY env var`)
   }
-
+  const agentPath = getAgentDir()
   return {
     models_json_path: path.join(agentPath, 'models.json'),
     health_check_log_path: path.join(agentPath, 'requesty-health-check.log'),
@@ -37,5 +33,3 @@ export function getEnv(): Env {
     health_check_mode: result.data,
   }
 }
-
-export default getEnv

package/src/index.ts

@@ -17,7 +17,7 @@ interface AutocompleteItem {
 export type NotificationLevel = 'info' | 'warning' | 'error'
 
 export type Notifier = {
-  notify(message: string, level?: NotificationLevel): void
+  notify(message: string, level: NotificationLevel): void
 }
 
 export type StatusReporter = {
@@ -62,7 +62,7 @@ export async function runCommand(args: string, status: StatusReporter, notifier:
   const parts = args.split(' ')
   const dryRun = parts.includes(DRY_RUN_ARG)
   if (dryRun) {
-    notifier.notify('running in dry mode, no changes will be done', undefined)
+    notifier.notify('running in dry mode, no changes will be done', 'info')
   }
 
   try {

package/src/models-json.ts

@@ -56,8 +56,10 @@ export function getRequestyConfig(envConfig: Env = getEnv()): RequestyConfig {
 }
 
 export function updateModelsJson(data: ModelsJson, models: ProviderModelConfig[], envConfig: Env = getEnv()): void {
+  const provider = data.providers[envConfig.provider_id]
   data.providers[envConfig.provider_id] = {
-    ...data.providers[envConfig.provider_id],
+    ...provider,
+    apiKey: nonEmptyString(provider.apiKey) ?? '$REQUESTY_API_KEY',
     models: models.map(model => ({
       id: model.id,
       name: model.name,