@kylebrodeur/pi-model-router 0.2.2 → 0.3.0

package/extensions/commands.ts

@@ -27,7 +27,11 @@ import {
   formatModelRef,
   formatDecision,
 } from './ui';
-import { performOllamaSync } from './ollama-sync';
+import {
+  hasModelDiscoveryCommand,
+  MODEL_DISCOVERY_INSTALL_COMMAND,
+  MODEL_DISCOVERY_SYNC_COMMAND,
+} from './model-discovery';
 import {
   tryFallback,
   tryRestore,
@@ -75,7 +79,7 @@ export const registerCommands = (
     { name: 'status', desc: 'Show current router status' },
     { name: 'config', desc: 'Show or toggle feature configuration' },
     { name: 'scope', desc: 'Manage Pi scoped-models from router config' },
-    { name: 'ollama-sync', desc: 'Sync Ollama models to models.json' },
+    { name: 'ollama-sync', desc: 'Delegate Ollama discovery to pi-model-discovery' },
     { name: 'fallback', desc: 'Switch to Ollama fallback model' },
     { name: 'restore', desc: 'Restore original model after fallback' },
     { name: 'profile', desc: 'Switch to a different router profile' },
@@ -229,7 +233,7 @@ export const registerCommands = (
       // ─── Fallback state (added by fork) ─────────────────────────────────
       `Fallback: ${getFallbackState().fallbackActive ? 'active 🏠' : 'inactive'}`,
       `Rate limit events: ${getRateLimitHistory().length}`,
-      `Features: ollamaSync=${state.currentConfig.features?.ollamaSync !== false ? 'on' : 'off'} rateLimit=${state.currentConfig.features?.rateLimitFallback !== false ? 'on' : 'off'}`,
+      `Features: rateLimit=${state.currentConfig.features?.rateLimitFallback !== false ? 'on' : 'off'}`,
     ];
     if (state.lastDecision) {
       lines.push(
@@ -584,7 +588,6 @@ export const registerCommands = (
 
     const defaultConfig = {
       features: {
-        ollamaSync: true,
         rateLimitFallback: true,
         scopeShim: true,
         perTurnRouting: true,
@@ -593,11 +596,6 @@ export const registerCommands = (
         phaseMemory: true,
         contextCompression: true,
       },
-      ollamaSync: {
-        enabled: true,
-        onStartup: true,
-        onReload: true,
-      },
       rateLimitFallback: {
         enabled: true,
         shortDelayThreshold: 60,
@@ -667,18 +665,21 @@ export const registerCommands = (
       ctx.ui.notify('Usage: /router ollama-sync (no arguments)', 'error');
       return;
     }
-    const result = await performOllamaSync(
-      pi,
-      (state.currentConfig.ollamaSync as Record<string, unknown>) ?? {},
-    );
-    if (result.success && result.added.length > 0) {
-      ctx.ui.notify(`Added: ${result.added.join(', ')}`, 'info');
-      ctx.ui.notify('Run /reload to see them', 'info');
-    } else if (result.success) {
-      ctx.ui.notify(result.message, 'info');
-    } else {
-      ctx.ui.notify(result.message, 'error');
+
+    if (hasModelDiscoveryCommand(pi)) {
+      ctx.ui.notify('Delegating Ollama model discovery to /providers sync.', 'info');
+      await pi.sendUserMessage(MODEL_DISCOVERY_SYNC_COMMAND, {
+        deliverAs: 'followUp',
+      });
+      return;
     }
+
+    ctx.ui.notify(
+      'Install pi-model-discovery for Ollama model discovery: ' +
+        MODEL_DISCOVERY_INSTALL_COMMAND +
+        '. Then run /providers sync.',
+      'warning',
+    );
   };
 
   const handleFallback = async (args: string[], ctx: ExtensionContext) => {
@@ -727,7 +728,6 @@ export const registerCommands = (
     if (args.length === 0) {
       const lines = [
         'Router Feature Configuration',
-        `  ollamaSync: ${state.currentConfig.features?.ollamaSync !== false ? 'enabled' : 'disabled'}`,
         `  rateLimitFallback: ${state.currentConfig.features?.rateLimitFallback !== false ? 'enabled' : 'disabled'}`,
         '  perTurnRouting: (always active)',
         `  intentClassifier: ${state.currentConfig.features?.intentClassifier ? 'enabled' : 'disabled'}`,
@@ -747,14 +747,6 @@ export const registerCommands = (
     }
 
     switch (feature) {
-      case 'ollama-sync':
-        state.currentConfig.features.ollamaSync =
-          !state.currentConfig.features.ollamaSync;
-        ctx.ui.notify(
-          `ollamaSync: ${state.currentConfig.features.ollamaSync ? 'enabled' : 'disabled'}`,
-          'info',
-        );
-        break;
       case 'rate-limit':
         state.currentConfig.features.rateLimitFallback =
           !state.currentConfig.features.rateLimitFallback;
@@ -789,7 +781,7 @@ export const registerCommands = (
         break;
       default:
         ctx.ui.notify(
-          `Unknown feature: ${feature}. Try: ollama-sync, rate-limit, classifier, budget, respect-pi-scope`,
+          `Unknown feature: ${feature}. Try: rate-limit, classifier, budget, respect-pi-scope`,
           'error',
         );
         return;
@@ -911,8 +903,6 @@ export const registerCommands = (
         case 'config': {
           const configPrefix = subArgs[0] ?? '';
           const items = [
-            'status',
-            'ollama-sync',
             'rate-limit',
             'classifier',
             'budget',
@@ -1017,9 +1007,9 @@ export const registerCommands = (
             [
               'Router Subcommands:',
               '  status                      Show current status, profile, pin, cost, and last decision.',
-              '  config [feature]            Show or toggle features (ollama-sync, rate-limit, classifier, budget).',
+              '  config [feature]            Show or toggle features (rate-limit, classifier, budget, respect-pi-scope).',
               '  scope <apply|reset|show>    Manage Pi scoped-models from your router config.',
-              '  ollama-sync                 Sync new Ollama models to models.json.',
+              '  ollama-sync                 Delegate Ollama model discovery to /providers sync.',
               '  fallback                    Switch to an Ollama model manually.',
               '  restore                     Restore the original model after fallback.',
               '  profile [name]              Switch to a profile (enables router if off). Lists available if no name.',

package/extensions/config.ts

@@ -20,7 +20,6 @@ export const FALLBACK_CONFIG: RouterConfig = {
   defaultProfile: 'auto',
   debug: false,
   features: {
-    ollamaSync: true,
     rateLimitFallback: true,
     scopeShim: true,
     respectPiScope: false, // Disabled by default for backward compatibility
@@ -121,10 +120,6 @@ export const mergeConfig = (
       base.features || override.features
         ? { ...base.features, ...override.features }
         : undefined,
-    ollamaSync:
-      base.ollamaSync || override.ollamaSync
-        ? { ...base.ollamaSync, ...override.ollamaSync }
-        : undefined,
     rateLimitFallback:
       base.rateLimitFallback || override.rateLimitFallback
         ? { ...base.rateLimitFallback, ...override.rateLimitFallback }
@@ -363,10 +358,6 @@ export const normalizeConfig = (raw: RouterConfig): ConfigLoadResult => {
         typeof raw.features === 'object' && raw.features !== null
           ? (raw.features as RouterConfig['features'])
           : undefined,
-      ollamaSync:
-        typeof raw.ollamaSync === 'object' && raw.ollamaSync !== null
-          ? (raw.ollamaSync as RouterConfig['ollamaSync'])
-          : undefined,
       rateLimitFallback:
         typeof raw.rateLimitFallback === 'object' &&
         raw.rateLimitFallback !== null

package/extensions/index.ts

@@ -24,12 +24,14 @@ import { updateStatus, formatModelRef } from './ui';
 import { registerCommands } from './commands';
 import { registerRouterProvider } from './provider';
 // ─── Feature modules (added by fork) ────────────────────────────────────────
-import { initializeOllamaSync } from './ollama-sync';
+import {
+  hasModelDiscoveryCommand,
+  MODEL_DISCOVERY_INSTALL_COMMAND,
+} from './model-discovery';
 import { initializeRateLimitFallback, checkAndRestore } from './rate-limit';
 
 // ─── Plugin Detection & Progressive Integration ──────────────────────────
 interface PluginStatus {
-  ledger: boolean;
   agentBus: boolean;
 }
 
@@ -51,7 +53,6 @@ const detectPlugins = (pi: ExtensionAPI): PluginStatus => {
     typeof legacyTools[name] === 'function';
 
   return {
-    ledger: hasTool('append_ledger'),
     agentBus: hasTool('link_send'),
   };
 };
@@ -64,17 +65,6 @@ const detectAndIntegratePlugins = (
   const plugins = detectPlugins(pi);
   const log = (pi as any).log || console;
 
-  // Ledger integration: log routing decisions to qmd-ledger
-  const shouldIntegrateLedger = features?.ledgerIntegration === true;
-  if (shouldIntegrateLedger && plugins.ledger) {
-    log.info(
-      '[router] Progressive: qmd-ledger detected. Routing decisions will be logged.',
-    );
-  } else if (shouldIntegrateLedger && !plugins.ledger) {
-    log.warn(
-      '[router] ledgerIntegration enabled but qmd-ledger not detected. Install with: pi install npm:pi-qmd-ledger',
-    );
-  }
 
   // Agent-bus integration: broadcast model changes
   const shouldIntegrateAgentBus = features?.agentBusIntegration === true;
@@ -145,6 +135,7 @@ const routerExtension = (pi: ExtensionAPI) => {
   let lastPersistedSnapshot: string | undefined;
   let isInitialized = false;
   let isInternalModelSwitch = false;
+  let warnedMissingModelDiscovery = false;
 
   const setModelInternally = async (
     model: NonNullable<ExtensionContext['model']>,
@@ -367,15 +358,6 @@ const routerExtension = (pi: ExtensionAPI) => {
     const ctx = lastExtensionContext;
     const features = currentConfig.features;
 
-    // Ollama sync
-    const shouldSyncOllama = !features || features.ollamaSync !== false; // enabled by default
-    if (shouldSyncOllama) {
-      initializeOllamaSync(
-        pi,
-        (currentConfig.ollamaSync ?? {}) as Record<string, unknown>,
-      );
-    }
-
     // Rate limit fallback
     const shouldInitRateLimit =
       !features || features.rateLimitFallback !== false; // enabled by default
@@ -387,15 +369,26 @@ const routerExtension = (pi: ExtensionAPI) => {
       );
     }
 
+    const hasDiscovery = hasModelDiscoveryCommand(pi);
+    if (!hasDiscovery && !warnedMissingModelDiscovery && ctx) {
+      warnedMissingModelDiscovery = true;
+      ctx.ui.notify(
+        'Router: install pi-model-discovery for Ollama model discovery if you use local Ollama models (' +
+          MODEL_DISCOVERY_INSTALL_COMMAND +
+          ').',
+        'warning',
+      );
+    }
+
     // ─── Progressive Plugin Integrations ───────────────────────────────────
     detectAndIntegratePlugins(pi, features, debugEnabled);
 
     if (debugEnabled) {
       console.log(
-        '[router] Feature sync complete - ollama:',
-        shouldSyncOllama,
-        'rate-limit:',
+        '[router] Feature sync complete - rate-limit:',
         shouldInitRateLimit,
+        'model-discovery:',
+        hasDiscovery,
       );
     }
   };

package/extensions/model-discovery.ts

@@ -0,0 +1,48 @@
+import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
+
+export const MODEL_DISCOVERY_PACKAGE = '@kylebrodeur/pi-model-discovery';
+export const MODEL_DISCOVERY_INSTALL_COMMAND =
+  'pi install npm:@kylebrodeur/pi-model-discovery';
+export const MODEL_DISCOVERY_SYNC_COMMAND = '/providers sync';
+
+interface PiCommandInfo {
+  name: string;
+  source?: string;
+  sourceInfo?: {
+    source?: string;
+    path?: string;
+    baseDir?: string;
+    scope?: string;
+    origin?: string;
+  };
+}
+
+type CommandAwareExtensionAPI = ExtensionAPI & {
+  getCommands?: () => PiCommandInfo[];
+};
+
+export const hasModelDiscoveryCommand = (pi: ExtensionAPI): boolean => {
+  const commandApi = pi as CommandAwareExtensionAPI;
+  try {
+    return commandApi.getCommands?.().some(isModelDiscoveryProvidersCommand) ?? false;
+  } catch {
+    return false;
+  }
+};
+
+const isModelDiscoveryProvidersCommand = (command: PiCommandInfo): boolean => {
+  if (command.name !== 'providers' || command.source !== 'extension') {
+    return false;
+  }
+  const provenance = [
+    command.sourceInfo?.source,
+    command.sourceInfo?.path,
+    command.sourceInfo?.baseDir,
+  ]
+    .filter((value): value is string => typeof value === 'string')
+    .join(' ');
+  return (
+    provenance.includes(MODEL_DISCOVERY_PACKAGE) ||
+    provenance.includes('pi-model-discovery')
+  );
+};

package/extensions/types.ts

@@ -3,18 +3,15 @@ import type { ThinkingLevel } from '@earendil-works/pi-agent-core';
 // ─── Feature Toggles (added by fork) ──────────────────────────────────────
 
 export type RouterFeature =
-  | 'ollamaSync'
   | 'rateLimitFallback'
   | 'perTurnRouting'
   | 'intentClassifier'
   | 'costBudgeting'
   | 'phaseMemory'
   | 'contextCompression'
-  | 'ledgerIntegration'
   | 'agentBusIntegration';
 
 export interface FeatureToggles {
-  ollamaSync?: boolean;
   rateLimitFallback?: boolean;
   scopeShim?: boolean;
   respectPiScope?: boolean;
@@ -23,11 +20,6 @@ export interface FeatureToggles {
   costBudgeting?: boolean;
   phaseMemory?: boolean;
   contextCompression?: boolean;
-  /**
-   * Log routing decisions to qmd-ledger if available.
-   * Progressive: detects pi-qmd-ledger at runtime.
-   */
-  ledgerIntegration?: boolean;
   /**
    * Publish model changes to pi-agent-bus MessageBus if available.
    * Progressive: detects pi-agent-bus at runtime.
@@ -35,17 +27,6 @@ export interface FeatureToggles {
   agentBusIntegration?: boolean;
 }
 
-export interface OllamaSyncConfig {
-  enabled?: boolean;
-  onStartup?: boolean;
-  onReload?: boolean;
-  addLaunchFlag?: boolean;
-  visionKeywords?: string[];
-  reasoningKeywords?: string[];
-  preferredFamilies?: string[];
-  defaultContextWindow?: number;
-  largeContextWindow?: number;
-}
 
 export interface RateLimitFallbackConfig {
   enabled?: boolean;
@@ -94,7 +75,6 @@ export interface RouterConfig {
   profiles: Record<string, RouterProfile>;
   // ─── Feature toggles (added by fork) ──────────────────────────────
   features?: FeatureToggles;
-  ollamaSync?: OllamaSyncConfig;
   rateLimitFallback?: RateLimitFallbackConfig;
 }
 

package/model-router.agent-bus.json

@@ -1,7 +1,6 @@
 {
-  "comment": "Progressive Step 2: Router with ledger + agent-bus integration. Enables agent coordination for model selection.",
+  "comment": "Router with agent-bus integration for model selection coordination.",
   "features": {
-    "ollamaSync": true,
     "rateLimitFallback": true,
     "scopeShim": true,
     "perTurnRouting": true,
@@ -9,7 +8,6 @@
     "costBudgeting": true,
     "phaseMemory": true,
     "contextCompression": true,
-    "ledgerIntegration": true,
     "agentBusIntegration": true
   }
 }

package/model-router.essential.json

@@ -1,7 +1,6 @@
 {
-  "comment": "Progressive Step 3: Essential config — all integrations enabled. Maximum interoperability with the Pi package ecosystem.",
+  "comment": "Essential router config with rate-limit fallback, scope sync, and agent-bus integration enabled.",
   "features": {
-    "ollamaSync": true,
     "rateLimitFallback": true,
     "scopeShim": true,
     "perTurnRouting": true,
@@ -9,14 +8,8 @@
     "costBudgeting": true,
     "phaseMemory": true,
     "contextCompression": true,
-    "ledgerIntegration": true,
     "agentBusIntegration": true
   },
-  "ollamaSync": {
-    "enabled": true,
-    "onStartup": true,
-    "onReload": true
-  },
   "rateLimitFallback": {
     "enabled": true,
     "shortDelayThreshold": 60,
@@ -25,7 +18,6 @@
     "fallbackSequence": ["anthropic/claude-3-haiku-20240307", "ollama/*"]
   },
   "rules": [
-    { "matches": "ledger", "tier": "low", "reason": "Ledger operations are lightweight" },
     { "matches": "agent-bus", "tier": "medium", "reason": "Agent coordination needs reliability" }
   ]
 }

package/model-router.example.json

@@ -1,6 +1,5 @@
 {
   "features": {
-    "ollamaSync": true,
     "rateLimitFallback": true,
     "scopeShim": true,
     "perTurnRouting": true,
@@ -9,11 +8,6 @@
     "phaseMemory": true,
     "contextCompression": true
   },
-  "ollamaSync": {
-    "enabled": true,
-    "onStartup": true,
-    "onReload": true
-  },
   "rateLimitFallback": {
     "enabled": true,
     "shortDelayThreshold": 60,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kylebrodeur/pi-model-router",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "type": "module",
   "description": "Intelligent per-turn model router extension for the pi coding agent (Enhanced Fork)",
   "keywords": [
@@ -15,7 +15,7 @@
   "author": "Kyle Brodeur <kylebrodeur@example.com> (https://github.com/kylebrodeur)",
   "repository": {
     "type": "git",
-    "url": "https://github.com/kylebrodeur/pi-model-router.git"
+    "url": "git+https://github.com/kylebrodeur/pi-model-router.git"
   },
   "homepage": "https://github.com/kylebrodeur/pi-model-router#readme",
   "bugs": {
@@ -25,7 +25,6 @@
     "extensions/",
     "docs/",
     "model-router.example.json",
-    "model-router.ledger.json",
     "model-router.agent-bus.json",
     "model-router.essential.json",
     "LICENSE",
@@ -44,11 +43,6 @@
       "./extensions/index.ts"
     ]
   },
-  "scripts": {
-    "tsc": "tsc --noEmit",
-    "build": "tsc",
-    "prepublishOnly": "npm run tsc"
-  },
   "peerDependencies": {
     "@earendil-works/pi-agent-core": "^0.78.1",
     "@earendil-works/pi-ai": "^0.78.1",
@@ -60,5 +54,10 @@
     "@earendil-works/pi-coding-agent": "^0.78.1",
     "prettier": "^3.8.1",
     "typescript": "^6.0.2"
+  },
+  "scripts": {
+    "tsc": "tsc --noEmit",
+    "test": "tsc --noEmit",
+    "build": "tsc"
   }
-}
+}