@hunterzhu/pulse-cli 0.5.0 → 0.5.1

package/dist/bin.js

@@ -4,6 +4,7 @@ import { createRequire } from 'node:module';
 import { isAbsolute, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { assertJarvisApiUrl, createMcpCapabilityPack, createPdfCapabilityPack, createSkillCapabilityPack, createSpreadsheetCapabilityPack } from '@hunterzhu/pulse-server';
+import { modelSelectionId, normalizeModelConfig, resolveModelReference } from '@hunterzhu/pulse-server';
 import { defaultPulseConfig, defaultPulseConfigPath, ensurePulseUserConfig, expandHome, loadPulseConfig } from './config.js';
 import { runInteractive } from './commands/interactive.js';
 import { runOneShot } from './commands/run.js';
@@ -162,7 +163,7 @@ export async function hostOptions(parsed) {
     }
     const loaded = (await loadPulseConfig(requestedCwd ?? process.cwd(), explicitConfig, parsed.options['trust-workspace'] === true)).value;
     // A missing user config still has to answer usage errors and list sessions.
-    const config = loaded.activeModel || loaded.models || loaded.providers ? loaded : { ...defaultPulseConfig, ...loaded };
+    const config = normalizeModelConfig(loaded.activeModel || loaded.models || loaded.providers ? loaded : { ...defaultPulseConfig, ...loaded });
     const mockResponse = option(parsed.options, 'mock-response');
     const mockTaskAssessment = option(parsed.options, 'mock-task-assessment');
     const mockStageAssessment = option(parsed.options, 'mock-stage-assessment');
@@ -171,25 +172,33 @@ export async function hostOptions(parsed) {
     const mockParallelPlanOption = option(parsed.options, 'mock-parallel-plan');
     const hasMockDemand = mockResponse !== undefined || mockTaskAssessment !== undefined || mockStageAssessment !== undefined || mockToolCallsOption !== undefined || mockAfterToolResponse !== undefined || mockParallelPlanOption !== undefined;
     const cliModel = option(parsed.options, 'model');
-    const requestedModel = cliModel ?? (hasMockDemand ? 'mock' : process.env.PULSE_MODEL ?? config.activeModel);
-    const effectiveModels = { ...(config.models ?? {}) };
+    const requestedModel = cliModel ?? (hasMockDemand ? 'mock/mock' : process.env.PULSE_MODEL ?? config.activeModel);
     const effectiveProviders = { ...(config.providers ?? {}) };
-    if (requestedModel === 'mock' || (hasMockDemand && cliModel === undefined)) {
-        if (!effectiveModels.mock) {
-            effectiveModels.mock = { displayName: 'mock', provider: 'mock', modelCode: 'mock', maxContextTokens: 32_000, maxOutputTokens: 4_096, reasoningEffort: 'medium' };
-        }
+    if (requestedModel === 'mock/mock' || requestedModel === 'mock' || (hasMockDemand && cliModel === undefined)) {
         if (!effectiveProviders.mock) {
             effectiveProviders.mock = { provider: 'mock', name: 'Mock' };
         }
+        effectiveProviders.mock.models ??= {};
+        effectiveProviders.mock.models.mock ??= { displayName: 'mock', modelCode: 'mock', maxContextTokens: 32_000, maxOutputTokens: 4_096, reasoningEffort: 'medium' };
+    }
+    const catalog = { ...config, providers: effectiveProviders };
+    const selections = Object.entries(effectiveProviders).flatMap(([providerId, profile]) => Object.entries(profile.models ?? {}).map(([modelId, model]) => ({ id: modelSelectionId(providerId, modelId), providerId, modelId, model })));
+    if (!requestedModel)
+        throw new Error('UNKNOWN_MODEL_DISPLAY_NAME:(missing)');
+    let activeModelName;
+    try {
+        activeModelName = resolveModelReference(catalog, requestedModel);
     }
-    const configuredModelEntry = requestedModel === undefined
-        ? undefined
-        : Object.entries(effectiveModels).find(([name, item]) => name === requestedModel || item.displayName === requestedModel);
+    catch (error) {
+        if (error instanceof Error && error.message.startsWith('AMBIGUOUS_MODEL_REFERENCE:'))
+            throw error;
+        throw new Error(`UNKNOWN_MODEL_DISPLAY_NAME:${requestedModel}`);
+    }
+    const configuredModelEntry = selections.find(item => item.id === activeModelName);
     if (!configuredModelEntry)
-        throw new Error(`UNKNOWN_MODEL_DISPLAY_NAME:${requestedModel ?? '(missing)'}`);
-    const [, modelSelection] = configuredModelEntry;
-    const activeModelName = modelSelection.displayName;
-    const providerName = modelSelection.provider;
+        throw new Error(`UNKNOWN_MODEL_DISPLAY_NAME:${requestedModel}`);
+    const modelSelection = configuredModelEntry.model;
+    const providerName = configuredModelEntry.providerId;
     const profile = effectiveProviders[providerName];
     if (!profile)
         throw new Error(`MODEL_PROVIDER_NOT_FOUND:${providerName}`);
@@ -244,28 +253,17 @@ export async function hostOptions(parsed) {
                     ...(item.toolChoice === undefined ? {} : { toolChoice: item.toolChoice }),
                 }]];
     }));
-    const modelDisplayNames = new Set();
-    const providerModels = Object.fromEntries(Object.entries(effectiveModels).flatMap(([name, item]) => {
-        if (!effectiveProviders[item.provider])
-            throw new Error(`MODEL_PROVIDER_NOT_FOUND:${item.provider}`);
-        const displayName = item.displayName.trim();
-        if (!displayName)
-            throw new Error(`MODEL_DISPLAY_NAME_REQUIRED:${name}`);
-        if (modelDisplayNames.has(displayName))
-            throw new Error(`DUPLICATE_MODEL_DISPLAY_NAME:${displayName}`);
-        modelDisplayNames.add(displayName);
-        return [[displayName, {
-                    provider: item.provider,
-                    model: item.modelCode,
-                    ...(item.maxContextTokens === undefined ? {} : { maxContextTokens: item.maxContextTokens }),
-                    ...(item.maxOutputTokens === undefined ? {} : { maxOutputTokens: item.maxOutputTokens }),
-                    ...(item.reasoningEffort === undefined ? {} : { reasoningEffort: item.reasoningEffort }),
-                }]];
-    }));
-    const assistantModelName = config.assistantModel ?? activeModelName;
+    const providerModels = Object.fromEntries(selections.map(({ id, providerId, model }) => [id, {
+            provider: providerId,
+            model: model.modelCode,
+            ...(model.maxContextTokens === undefined ? {} : { maxContextTokens: model.maxContextTokens }),
+            ...(model.maxOutputTokens === undefined ? {} : { maxOutputTokens: model.maxOutputTokens }),
+            ...(model.reasoningEffort === undefined ? {} : { reasoningEffort: model.reasoningEffort }),
+        }]));
+    const assistantModelName = config.assistantModel ? resolveModelReference(catalog, config.assistantModel) : activeModelName;
     if (!providerModels[assistantModelName])
         throw new Error(`UNKNOWN_ASSISTANT_MODEL:${assistantModelName}`);
-    const taskRouting = config.taskRouting;
+    const taskRouting = config.taskRouting && Object.fromEntries(Object.entries(config.taskRouting).map(([task, route]) => [task, Array.isArray(route) ? route.map(item => resolveModelReference(catalog, item)) : route]));
     for (const [task, models] of Object.entries(taskRouting ?? {})) {
         if (!Array.isArray(models) || models.length === 0 || models.some((model) => typeof model !== 'string' || !providerModels[model])) {
             throw new Error(`INVALID_TASK_MODEL_ROUTE:${task}`);
@@ -425,7 +423,7 @@ export async function hostOptions(parsed) {
         provider,
         providerProfiles,
         providerModels,
-        modelPricing: Object.fromEntries(Object.values(config.models ?? {}).flatMap((item) => item.pricing ? [[item.displayName, item.pricing]] : [])),
+        modelPricing: Object.fromEntries(selections.flatMap(({ id, model }) => model.pricing ? [[id, model.pricing]] : [])),
         ...(taskRouting === undefined ? {} : { taskRouting }),
         capabilityPacks,
         enabledCapabilityPacks,
@@ -446,8 +444,21 @@ export async function hostOptions(parsed) {
         ...(allowNetwork === undefined ? {} : { allowNetwork }),
         ...(config.networkHosts === undefined ? {} : { networkHosts: config.networkHosts }),
         jarvis,
-        ...(config.frontModel ? { frontModel: config.frontModel } : {}),
-        ...(config.approvalReview?.model ? { approvalReview: { provider: config.approvalReview.provider ?? 'ollama', model: config.approvalReview.model, baseURL: config.approvalReview.baseURL ?? 'http://127.0.0.1:11434', timeoutMs: Math.max(1_000, Math.min(60_000, config.approvalReview.timeoutMs ?? 15_000)) } } : {}),
+        ...(config.frontModel ? { frontModel: (() => {
+                const selected = typeof config.frontModel?.model === 'string' ? resolveModelReference(catalog, config.frontModel.model) : undefined;
+                const entry = selections.find(item => item.id === selected);
+                const source = entry && effectiveProviders[entry.providerId];
+                const keyEnv = source?.apiKeyEnv ?? (source?.provider === 'anthropic' ? 'ANTHROPIC_API_KEY' : 'OPENAI_API_KEY');
+                return { ...config.frontModel, ...(entry && source ? { provider: source.provider, model: entry.model.modelCode, ...(source.baseURL ? { baseURL: source.baseURL } : {}), ...(process.env[keyEnv] ? { apiKey: process.env[keyEnv] } : {}) } : {}) };
+            })() } : {}),
+        ...(config.approvalReview?.model ? { approvalReview: (() => {
+                const selected = resolveModelReference(catalog, config.approvalReview.model);
+                const entry = selections.find(item => item.id === selected);
+                const source = entry && effectiveProviders[entry.providerId];
+                if (!entry || !source || source.provider !== 'ollama')
+                    throw new Error('APPROVAL_REVIEW_REQUIRES_OLLAMA');
+                return { provider: 'ollama', model: entry.model.modelCode, baseURL: source.baseURL ?? 'http://127.0.0.1:11434', timeoutMs: Math.max(1_000, Math.min(60_000, config.approvalReview.timeoutMs ?? 15_000)) };
+            })() } : {}),
     };
 }
 export async function main() {

package/dist/config.d.ts

@@ -13,14 +13,16 @@ export interface PulseCliProviderProfile {
             name: string;
         };
     };
+    /** Models served by this provider. The provider plus map key is the model identity. */
+    models?: Record<string, Omit<PulseCliModel, 'provider'>>;
 }
 export interface PulseCliModel {
-    /** Provider map key, not the adapter id. */
-    provider: string;
+    /** Legacy flat-config field; nested models inherit their provider from the parent. */
+    provider?: string;
     /** Exact model identifier sent to the provider. */
     modelCode: string;
     /** Globally unique name shown by the CLI and accepted by `/model`. */
-    displayName: string;
+    displayName?: string;
     maxContextTokens?: number;
     maxOutputTokens?: number;
     reasoningEffort?: 'low' | 'medium' | 'high';
@@ -61,13 +63,13 @@ export interface PulseCliConfig {
     systemPromptFile?: string;
     /** Named provider profiles. The map key is a stable provider code. */
     providers?: Record<string, PulseCliProviderProfile>;
-    /** Globally unique Pulse model names mapped to provider/model codes. */
+    /** @deprecated Legacy flat model catalog. New configs nest models under providers. */
     models?: Record<string, PulseCliModel>;
-    /** Active Pulse model display name. */
+    /** Active Pulse model reference, preferably providerId/modelId. */
     activeModel?: string;
     /** Dedicated model for the persistent Pulse assistant chat; defaults to activeModel. */
     assistantModel?: string;
-    /** Ordered model display names per task; later entries act as fallbacks. */
+    /** Ordered providerId/modelId references per task; later entries act as fallbacks. */
     taskRouting?: Partial<Record<PulseModelTask, string[]>>;
     capabilities?: PulseCliCapabilities;
     approvalMode?: 'read-only' | 'ask' | 'auto';

package/dist/config.js

@@ -3,26 +3,23 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve, sep } from 'node:path';
 export const defaultPulseConfig = {
     providers: {
-        mock: { provider: 'mock', name: 'Mock' },
+        mock: { provider: 'mock', name: 'Mock', models: { mock: { displayName: 'mock', modelCode: 'mock', maxContextTokens: 32_000, maxOutputTokens: 4_096, reasoningEffort: 'medium' } } },
         openai: {
             provider: 'openai-compatible',
             name: 'OpenAI',
             baseURL: 'https://api.openai.com/v1',
             apiKeyEnv: 'OPENAI_API_KEY',
+            models: { 'gpt5.6-a': { displayName: 'gpt5.6-a', modelCode: 'gpt-5.6' } },
         },
         deepseek: {
             provider: 'deepseek',
             name: 'DeepSeek',
             baseURL: 'https://api.deepseek.com',
             apiKeyEnv: 'DEEPSEEK_API_KEY',
+            models: { 'deepseek-chat': { displayName: 'deepseek-chat', modelCode: 'deepseek-chat' } },
         },
     },
-    models: {
-        mock: { displayName: 'mock', provider: 'mock', modelCode: 'mock', maxContextTokens: 32_000, maxOutputTokens: 4_096, reasoningEffort: 'medium' },
-        'gpt5.6-a': { displayName: 'gpt5.6-a', provider: 'openai', modelCode: 'gpt-5.6' },
-        'deepseek-chat': { displayName: 'deepseek-chat', provider: 'deepseek', modelCode: 'deepseek-chat' },
-    },
-    activeModel: 'mock',
+    activeModel: 'mock/mock',
     approvalMode: 'ask',
     maxTurns: 32,
     autoCompactPercent: 90,
@@ -82,6 +79,13 @@ export function sanitizeWorkspaceConfig(value) {
         const safe = {
             provider: profile.provider,
             ...(profile.name === undefined ? {} : { name: profile.name }),
+            ...(profile.models === undefined ? {} : { models: Object.fromEntries(Object.entries(profile.models).flatMap(([modelId, model]) => model.modelCode ? [[modelId, {
+                            modelCode: model.modelCode,
+                            ...(model.displayName === undefined ? {} : { displayName: model.displayName }),
+                            ...(model.maxContextTokens === undefined ? {} : { maxContextTokens: model.maxContextTokens }),
+                            ...(model.maxOutputTokens === undefined ? {} : { maxOutputTokens: model.maxOutputTokens }),
+                            ...(model.reasoningEffort === undefined ? {} : { reasoningEffort: model.reasoningEffort }),
+                        }]] : [])) }),
         };
         return Object.keys(safe).length ? [[name, safe]] : [];
     }));
@@ -100,7 +104,7 @@ export function sanitizeWorkspaceConfig(value) {
                 return [[name, {
                             provider: model.provider,
                             modelCode: model.modelCode,
-                            displayName: model.displayName,
+                            ...(model.displayName === undefined ? {} : { displayName: model.displayName }),
                             ...(model.maxContextTokens === undefined ? {} : { maxContextTokens: model.maxContextTokens }),
                             ...(model.maxOutputTokens === undefined ? {} : { maxOutputTokens: model.maxOutputTokens }),
                             ...(model.reasoningEffort === undefined ? {} : { reasoningEffort: model.reasoningEffort }),
@@ -113,10 +117,19 @@ export function mergePulseConfigs(layers) {
     let merged = {};
     for (const layer of layers) {
         const value = layer.trust === 'workspace' ? sanitizeWorkspaceConfig(layer.value) : layer.value;
+        const providers = { ...(merged.providers ?? {}) };
+        for (const [providerId, profile] of Object.entries(value.providers ?? {})) {
+            const previous = providers[providerId];
+            providers[providerId] = {
+                ...previous,
+                ...profile,
+                ...(previous?.models === undefined && profile.models === undefined ? {} : { models: { ...previous?.models, ...profile.models } }),
+            };
+        }
         merged = {
             ...merged,
             ...value,
-            ...(merged.providers === undefined && value.providers === undefined ? {} : { providers: { ...merged.providers, ...value.providers } }),
+            ...(merged.providers === undefined && value.providers === undefined ? {} : { providers }),
             ...(merged.models === undefined && value.models === undefined ? {} : { models: { ...merged.models, ...value.models } }),
         };
     }

package/dist/release-highlights.generated.js

@@ -1,5 +1,23 @@
 // Generated from CHANGELOG.md and CHANGELOG.en.md by scripts/release/sync-cli-highlights.mjs. Do not edit manually.
 export const releaseHighlights = {
+    "0.5.1": [
+        {
+            "zh": "模型目录按供应商管理，支持不同供应商登记同名模型；默认模型、助理聊天、任务路由、即时预回复和审批复核统一选择已登记模型。",
+            "en": "Models are managed under providers, allowing different providers to register the same model name; defaults, assistant chat, task routing, instant replies, and approval review all select registered models."
+        },
+        {
+            "zh": "项目侧栏支持组织会话与项目，并完善工作区信任边界及模型配置迁移。",
+            "en": "Added project sidebar organization and improved workspace trust boundaries and model configuration migration."
+        },
+        {
+            "zh": "即时预回复按所选供应商模型读取协议与连接配置；审批复核继续限制为本机 Ollama，并在异常时交回人工。",
+            "en": "Instant replies use the selected provider's protocol and connection settings; approval review remains restricted to local Ollama and falls back to human review on errors."
+        },
+        {
+            "zh": "改善 Jarvis 经验记录、上下文筛选和持久化交付流程。",
+            "en": "Improved Jarvis experience recording, context filtering, and durable delivery workflows."
+        }
+    ],
     "0.5.0": [
         {
             "zh": "新增独立 Web 工作台，统一助理聊天、项目工作会话、历史记录、设置与本地终端。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunterzhu/pulse-cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A local-first AI task assistant for coding, research, and file workflows.",
   "license": "PolyForm-Noncommercial-1.0.0",
   "keywords": [
@@ -36,7 +36,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@hunterzhu/pulse-server": "0.5.0",
+    "@hunterzhu/pulse-server": "0.5.1",
     "chalk": "^5.4.1",
     "highlight.js": "^11.10.0",
     "ink": "^7.1.1",