specrails-desktop 2.30.2 → 2.31.0

package/server/dist/project-registry.js

@@ -803,7 +803,7 @@ class ProjectRegistry {
         // an `ai_invocations` row (surface='setup'). Returns null until the project
         // context exists, in which case nothing is recorded (best-effort).
         (pid) => this._contexts.get(pid)?.db ?? null);
-        const proposalManager = new proposal_manager_1.ProposalManager(boundBroadcast, db, project.path, project.id);
+        const proposalManager = new proposal_manager_1.ProposalManager(boundBroadcast, db, project.path, project.id, project.provider ?? 'claude', project.slug);
         const agentRefineManager = new agent_refine_manager_1.AgentRefineManager(boundBroadcast, db, project.path, project.id, project.provider ?? 'claude');
         // Retention prune: drop stale/abandoned refine sessions on project load.
         try {
@@ -812,7 +812,7 @@ class ProjectRegistry {
         catch (err) {
             console.error('[project-registry] prune refine sessions failed:', err);
         }
-        const specLauncherManager = new spec_launcher_manager_1.SpecLauncherManager(boundBroadcast, project.path, db, project.id);
+        const specLauncherManager = new spec_launcher_manager_1.SpecLauncherManager(boundBroadcast, project.path, db, project.id, project.provider ?? 'claude', project.slug);
         // FileSummaryManager — code-explorer. The class is constructed for every
         // project regardless of the feature flag; the router 404s when the flag
         // is off, so no spawn can occur. Budget reader queries `ai_invocations`

package/server/dist/project-router-chat.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerChatRoutes = registerChatRoutes;
 const ids_1 = require("./ids");
 const db_1 = require("./db");
+const providers_1 = require("./providers");
+const runtime_1 = require("./providers/runtime");
 const context_scope_1 = require("./context-scope");
 const spec_models_1 = require("./spec-models");
 const provider_selection_1 = require("./provider-selection");
@@ -46,6 +48,14 @@ function registerChatRoutes(deps) {
         }
         const rawKind = req.body?.kind;
         const kind = rawKind === 'explore' ? 'explore' : rawKind === 'milestone' ? 'milestone' : 'sidebar';
+        if (kind === 'milestone' && !(0, runtime_1.supportsToolPolicy)((0, providers_1.getAdapter)(provider), 'read-only')) {
+            res.status(409).json({
+                error: 'provider_tool_policy_unsupported',
+                provider,
+                requiredPolicy: 'read-only',
+            });
+            return;
+        }
         const id = (0, ids_1.newId)();
         const rawScope = req.body?.contextScope;
         if (rawScope !== undefined && kind !== 'explore') {
@@ -67,11 +77,9 @@ function registerChatRoutes(deps) {
         let scope;
         if (kind === 'explore') {
             const fallback = (0, context_scope_1.getLastContextScope)(db, 'explore');
-            // Defence-in-depth: SMASH / Contract Layer is Claude-only. Strip
-            // contractRefine from the scope when the conversation's resolved provider
-            // is non-Claude so no downstream code (Contract Refine Runner, SMASH
-            // eligibility) ever sees a mismatched flag.
-            const safeRawScope = provider !== 'claude' && rawScope != null
+            // Defence-in-depth: retain Contract Refine only for providers that
+            // advertise the structured-action contract.
+            const safeRawScope = (0, providers_1.getAdapter)(provider).capabilities.structuredActions !== true && rawScope != null
                 ? { ...rawScope, contractRefine: false }
                 : rawScope;
             scope = (0, context_scope_1.normalizeContextScope)(safeRawScope ?? fallback, fallback);
@@ -86,7 +94,7 @@ function registerChatRoutes(deps) {
         res.status(201).json({ conversation });
     });
     router.get('/:projectId/chat/conversations/:id', (req, res) => {
-        const { db } = ctx(req);
+        const { db, project } = ctx(req);
         const conversation = (0, db_1.getConversation)(db, req.params.id);
         if (!conversation) {
             res.status(404).json({ error: 'Conversation not found' });
@@ -128,7 +136,7 @@ function registerChatRoutes(deps) {
         res.json({ ok: true });
     });
     router.patch('/:projectId/chat/conversations/:id', (req, res) => {
-        const { db } = ctx(req);
+        const { db, project } = ctx(req);
         const conversation = (0, db_1.getConversation)(db, req.params.id);
         if (!conversation) {
             res.status(404).json({ error: 'Conversation not found' });
@@ -146,7 +154,8 @@ function registerChatRoutes(deps) {
         if (model !== undefined) {
             // Validate against the conversation's own provider so a bad value can't be
             // persisted and break the next turn's spawn. (Mirrors the POST handler.)
-            const convProvider = conversation.provider ?? 'claude';
+            const convProvider = conversation.provider ??
+                (project.provider ?? 'claude');
             if (typeof model !== 'string' || !(0, spec_models_1.isValidModelForProvider)(model, convProvider)) {
                 res.status(400).json({
                     error: `Invalid model "${String(model)}" for provider "${convProvider}"`,

package/server/dist/project-router-helpers.js

@@ -13,6 +13,7 @@ exports.deriveFallbackShortSummary = deriveFallbackShortSummary;
 exports.lightlyStructurePrompt = lightlyStructurePrompt;
 exports.formatDescriptionWithCriteria = formatDescriptionWithCriteria;
 exports.resolveDefaultSpecModel = resolveDefaultSpecModel;
+exports.readAgentModelSelection = readAgentModelSelection;
 exports.readAgentModels = readAgentModels;
 exports.applyModelConfig = applyModelConfig;
 exports.serializeInstallConfigYaml = serializeInstallConfigYaml;
@@ -31,6 +32,11 @@ exports.TERMINAL_PANEL_ENABLED = TERMINAL_PANEL_ENABLED;
  */
 function serializeInstallConfigYaml(config) {
     const c = config;
+    const requestedProvider = typeof c.provider === 'string' ? c.provider : '';
+    const provider = (0, spec_models_1.getProviderDefault)(requestedProvider)
+        ? requestedProvider
+        : 'claude';
+    const defaultModel = (0, spec_models_1.getProviderDefault)(provider) || (0, spec_models_1.getProviderDefault)('claude');
     const overrides = c.models?.overrides ?? {};
     const overridesEntries = Object.entries(overrides);
     const overridesYaml = overridesEntries.length > 0
@@ -40,14 +46,14 @@ function serializeInstallConfigYaml(config) {
         '# specrails install config — generated by Specrails',
         `# Re-run: npx ${core_package_1.CORE_PACKAGE_SPEC} init  to regenerate`,
         `version: ${c.version ?? 1}`,
-        `provider: ${c.provider ?? 'claude'}`,
+        `provider: ${provider}`,
         `tier: ${c.tier ?? 'quick'}`,
         `agents:`,
         `  selected: [${(c.agents?.selected ?? []).join(', ')}]`,
         `  excluded: [${(c.agents?.excluded ?? []).join(', ')}]`,
         `models:`,
         `  preset: ${c.models?.preset ?? 'balanced'}`,
-        `  defaults: { model: ${c.models?.defaults?.model ?? 'sonnet'} }`,
+        `  defaults: { model: ${c.models?.defaults?.model ?? defaultModel} }`,
         `  overrides:${overridesYaml}`,
         `agent_teams: ${c.agent_teams ?? false}`,
         '',
@@ -57,6 +63,13 @@ function serializeInstallConfigYaml(config) {
 // ─── Agent model helpers ──────────────────────────────────────────────────────
 const VALID_MODEL_ALIASES = ['sonnet', 'fable', 'opus', 'haiku'];
 exports.VALID_MODEL_ALIASES = VALID_MODEL_ALIASES;
+function projectExecutionRoot(project) {
+    const exec = (0, workspace_resolution_1.resolveProjectExecution)({ slug: project.slug, path: project.path });
+    return exec.relocated && exec.workspaceDir ? exec.workspaceDir : project.path;
+}
+function isKimiAgentModelProject(project) {
+    return project.provider === 'kimi';
+}
 /**
  * Relocate-artifacts: where the agent `.claude/agents/*.md` files live. When the
  * project is relocated AND the workspace is populated by core, the agents are
@@ -64,15 +77,84 @@ exports.VALID_MODEL_ALIASES = VALID_MODEL_ALIASES;
  * router uses for profiles). Legacy ⇒ `<project>/.claude/agents` (byte-identical).
  */
 function resolveAgentsDir(project) {
-    const exec = (0, workspace_resolution_1.resolveProjectExecution)({ slug: project.slug, path: project.path });
-    const root = exec.relocated && exec.workspaceDir ? exec.workspaceDir : project.path;
-    return path_1.default.join(root, '.claude', 'agents');
+    return path_1.default.join(projectExecutionRoot(project), '.claude', 'agents');
+}
+function resolveKimiSkillsDir(project) {
+    return path_1.default.join(projectExecutionRoot(project), '.kimi-code', 'skills');
+}
+function readAgentModelSelection(project) {
+    const provider = (project.provider ?? 'claude');
+    const fallback = (0, spec_models_1.getProviderDefault)(provider);
+    const configPath = (0, install_config_path_1.installConfigPath)(project);
+    if (!fs_1.default.existsSync(configPath))
+        return { defaultModel: fallback, overrides: {} };
+    let configText;
+    try {
+        configText = fs_1.default.readFileSync(configPath, 'utf-8');
+    }
+    catch {
+        return { defaultModel: fallback, overrides: {} };
+    }
+    const defaultsMatch = configText.match(/defaults:\s*\{\s*model:\s*(\S+?)\s*\}/);
+    const configuredDefault = defaultsMatch?.[1];
+    const defaultModel = configuredDefault && (0, spec_models_1.isValidModelForProvider)(configuredDefault, provider)
+        ? configuredDefault
+        : fallback;
+    const overrides = {};
+    const overridesBlockMatch = configText.match(/overrides:([\s\S]*?)(?:\n\S|$)/);
+    if (overridesBlockMatch) {
+        const overrideLines = overridesBlockMatch[1].match(/^ {2,}(\S+):\s*(\S+)/gm) ?? [];
+        for (const line of overrideLines) {
+            const match = line.match(/^\s+(\S+):\s*(\S+)/);
+            if (match
+                && (0, spec_models_1.isValidModelForProvider)(match[2], provider)) {
+                overrides[match[1]] = match[2];
+            }
+        }
+    }
+    return { defaultModel, overrides };
+}
+function readKimiAgentModels(project) {
+    const skillsDir = resolveKimiSkillsDir(project);
+    if (!fs_1.default.existsSync(skillsDir))
+        return [];
+    let entries;
+    try {
+        entries = fs_1.default.readdirSync(skillsDir, { withFileTypes: true });
+    }
+    catch {
+        return [];
+    }
+    const { defaultModel, overrides } = readAgentModelSelection(project);
+    const agents = [];
+    for (const entry of entries) {
+        // Kimi commands and OpenSpec skills share this directory. Only direct
+        // provider-native rail roles participate in per-agent model overrides.
+        if (!entry.isDirectory()
+            || (!entry.name.startsWith('sr-') && !entry.name.startsWith('custom-')))
+            continue;
+        const skillPath = path_1.default.join(skillsDir, entry.name, 'SKILL.md');
+        try {
+            if (!fs_1.default.statSync(skillPath).isFile())
+                continue;
+            agents.push({
+                name: entry.name,
+                model: overrides[entry.name] ?? defaultModel,
+            });
+        }
+        catch {
+            // Skip incomplete or unreadable role directories.
+        }
+    }
+    return agents;
 }
 /**
  * Read installed agents from `.claude/agents/*.md` (top-level only, no subdirs).
  * Extracts the `model:` field from YAML frontmatter.
  */
 function readAgentModels(project) {
+    if (isKimiAgentModelProject(project))
+        return readKimiAgentModels(project);
     const agentsDir = resolveAgentsDir(project);
     if (!fs_1.default.existsSync(agentsDir))
         return [];
@@ -115,6 +197,12 @@ function readAgentModels(project) {
  * defaults/overrides. No-op if the config file does not exist.
  */
 function applyModelConfig(project) {
+    // Kimi SKILL.md frontmatter has no per-role `model:` field. Its selected
+    // default/overrides live in install-config.yaml and are applied by the
+    // runtime when the role is invoked. Never inject Claude agent syntax into a
+    // Kimi skill: readAgentModels projects the config over the direct roles.
+    if (isKimiAgentModelProject(project))
+        return;
     const configPath = (0, install_config_path_1.installConfigPath)(project);
     if (!fs_1.default.existsSync(configPath))
         return;

package/server/dist/project-router-jobs.js

@@ -10,6 +10,7 @@ const db_1 = require("./db");
 const queue_manager_1 = require("./queue-manager");
 const feature_flags_1 = require("./feature-flags");
 const types_1 = require("./types");
+const providers_1 = require("./providers");
 const hooks_1 = require("./hooks");
 const explore_smash_1 = require("./explore-smash");
 const job_spawn_idempotency_1 = require("./job-spawn-idempotency");
@@ -39,8 +40,38 @@ function registerJobsRoutes(deps) {
     const { router, registry, ctx, ticketPath } = deps;
     // ─── Queue / Spawn routes ────────────────────────────────────────────────────
     router.post('/:projectId/spawn', (req, res) => {
-        const { command, priority, dependsOnJobId, pipelineId, profileName, aiEngine } = req.body ?? {};
-        if (!command || typeof command !== 'string' || !command.trim()) {
+        const { command, priority, dependsOnJobId, pipelineId, profileName, aiEngine, model, rerunOfJobId, } = req.body ?? {};
+        if (rerunOfJobId !== undefined
+            && (typeof rerunOfJobId !== 'string' || !/^[A-Za-z0-9._:-]{1,128}$/.test(rerunOfJobId))) {
+            res.status(400).json({ error: 'rerunOfJobId must be 1-128 URL-safe characters' });
+            return;
+        }
+        const c = ctx(req);
+        const rerunSource = typeof rerunOfJobId === 'string'
+            ? (0, db_1.getJob)(c.db, rerunOfJobId)
+            : undefined;
+        if (typeof rerunOfJobId === 'string' && !rerunSource) {
+            res.status(404).json({ error: 'Rerun source job not found' });
+            return;
+        }
+        if (rerunSource
+            && rerunSource.status !== 'completed'
+            && rerunSource.status !== 'failed') {
+            res.status(409).json({ error: 'Only completed or failed jobs can be rerun' });
+            return;
+        }
+        // A rerun is server-owned: never trust duplicated command/provider/model/
+        // profile metadata from the client. The exact command retains ticket
+        // identity, while the persisted job + profile snapshot retain execution
+        // identity. Jobs do not persist reasoning effort or launch-surface origin,
+        // so this route deliberately does not manufacture either value.
+        const effectiveCommand = rerunSource?.command ?? command;
+        const effectiveAiEngine = rerunSource?.provider ?? (rerunSource ? undefined : aiEngine);
+        const requestedModel = rerunSource?.model ?? (rerunSource ? undefined : model);
+        const requestedProfileName = rerunSource
+            ? (rerunSource.profile_name ?? null)
+            : profileName;
+        if (!effectiveCommand || typeof effectiveCommand !== 'string' || !effectiveCommand.trim()) {
             res.status(400).json({ error: 'command is required' });
             return;
         }
@@ -57,8 +88,8 @@ function registerJobsRoutes(deps) {
             ? dependsOnJobId.trim()
             : undefined;
         // profileName accepts: undefined (default resolution), null (force legacy), string (explicit)
-        const normalizedProfileName = profileName === null ? null
-            : typeof profileName === 'string' && profileName.trim() ? profileName.trim()
+        const normalizedProfileName = requestedProfileName === null ? null
+            : typeof requestedProfileName === 'string' && requestedProfileName.trim() ? requestedProfileName.trim()
                 : undefined;
         const idempotencyKey = req.get('Idempotency-Key');
         if (idempotencyKey !== undefined && !/^[A-Za-z0-9._:-]{1,128}$/.test(idempotencyKey)) {
@@ -67,21 +98,46 @@ function registerJobsRoutes(deps) {
         }
         // aiEngine: optional per-job provider override; must be installed on the
         // project. Omitting it runs on the project's primary provider.
-        const engineCheck = (0, provider_selection_1.validateRequestedProvider)(ctx(req).project, aiEngine);
+        const engineCheck = (0, provider_selection_1.validateRequestedProvider)(c.project, effectiveAiEngine);
         if (!engineCheck.ok) {
             res.status(400).json({ error: engineCheck.error });
             return;
         }
+        let normalizedModel;
+        if (requestedModel !== undefined && requestedModel !== null) {
+            if (typeof requestedModel !== 'string'
+                || !(0, spec_models_1.isValidModelForProvider)(requestedModel, engineCheck.provider)) {
+                // Some older non-alias providers persisted the provider-reported full
+                // model ID rather than the launch alias. Preserve their historical
+                // rerun behaviour (provider default) while failing closed for adapters
+                // that advertise exact custom aliases such as Kimi.
+                if (rerunSource
+                    && (0, providers_1.getAdapter)(engineCheck.provider).capabilities.customModelAliases !== true) {
+                    normalizedModel = undefined;
+                }
+                else {
+                    res.status(400).json({
+                        error: `model is not valid for provider "${engineCheck.provider}"`,
+                        allowed: (0, spec_models_1.getModelsForProvider)(engineCheck.provider),
+                    });
+                    return;
+                }
+            }
+            else {
+                normalizedModel = requestedModel;
+            }
+        }
         try {
-            const c = ctx(req);
             const normalizedPriority = priority ?? 'normal';
             const spawnFingerprint = idempotencyKey ? (0, job_spawn_idempotency_1.fingerprintJobSpawn)({
-                command,
+                command: effectiveCommand,
                 priority: normalizedPriority,
                 dependsOnJobId: normalizedDependsOnJobId ?? null,
                 pipelineId: pipelineId || null,
                 profileName: normalizedProfileName === undefined ? '__project_default__' : normalizedProfileName,
-                provider: aiEngine ? engineCheck.provider : null,
+                provider: effectiveAiEngine ? engineCheck.provider : null,
+                model: normalizedModel ?? null,
+                rerunOfJobId: rerunOfJobId ?? null,
             }) : null;
             if (idempotencyKey && spawnFingerprint) {
                 const existingJobId = (0, job_spawn_idempotency_1.findIdempotentJob)(c.db, idempotencyKey, spawnFingerprint);
@@ -101,14 +157,15 @@ function registerJobsRoutes(deps) {
                 ...(normalizedProfileName !== undefined
                     ? { profileName: normalizedProfileName }
                     : {}),
-                provider: aiEngine ? engineCheck.provider : undefined,
+                provider: effectiveAiEngine ? engineCheck.provider : undefined,
+                ...(normalizedModel ? { model: normalizedModel } : {}),
             };
             const job = idempotencyKey && spawnFingerprint && preparedJobId
-                ? c.queueManager.enqueue(command, normalizedPriority, enqueueOptions, {
+                ? c.queueManager.enqueue(effectiveCommand, normalizedPriority, enqueueOptions, {
                     jobId: preparedJobId,
                     commit: (db) => (0, job_spawn_idempotency_1.claimIdempotentJob)(db, idempotencyKey, spawnFingerprint, preparedJobId),
                 })
-                : c.queueManager.enqueue(command, normalizedPriority, enqueueOptions);
+                : c.queueManager.enqueue(effectiveCommand, normalizedPriority, enqueueOptions);
             const position = job.queuePosition ?? 0;
             res.status(202).json({ jobId: job.id, position });
         }
@@ -280,7 +337,14 @@ function registerJobsRoutes(deps) {
         const provider = (0, provider_selection_1.resolveProvider)(project, typeof req.query.provider === 'string' ? req.query.provider : undefined);
         const model = (0, project_router_helpers_1.resolveDefaultSpecModel)({ projectPath: project.path, slug: project.slug, provider });
         const allowed = (0, spec_models_1.getModelsForProvider)(provider);
-        res.json({ model, provider, allowed, providers: project.providers });
+        const adapter = (0, providers_1.getAdapter)(provider);
+        res.json({
+            model,
+            provider,
+            allowed,
+            providers: project.providers,
+            customModelAliases: adapter.capabilities.customModelAliases === true,
+        });
     });
     // Cancellation is idempotent and intentionally separate from history
     // deletion. A stale UI request that races with natural completion must never

package/server/dist/project-router-loop-runs.js

@@ -11,7 +11,6 @@ const spec_models_1 = require("./spec-models");
 const workspace_resolution_1 = require("./workspace-resolution");
 const loop_command_catalog_1 = require("./loop-command-catalog");
 const ids_1 = require("./ids");
-const VALID_REASONING_EFFORTS = new Set(['low', 'medium', 'high']);
 function registerLoopRunRoutes(deps) {
     const { router, ctx } = deps;
     // GET a single loop run's live/terminal state. Backs the companion's running
@@ -27,7 +26,19 @@ function registerLoopRunRoutes(deps) {
             res.status(404).json({ error: 'Loop run not found' });
             return;
         }
-        res.json({ loopRun: run });
+        const usageAvailable = !run.provider
+            || !(0, providers_1.hasAdapter)(run.provider)
+            || (0, providers_1.getAdapter)(run.provider).capabilities.reportsUsage !== false;
+        res.json({
+            loopRun: usageAvailable
+                ? { ...run, usage_available: true }
+                : {
+                    ...run,
+                    total_cost_usd: null,
+                    total_tokens: null,
+                    usage_available: false,
+                },
+        });
     });
     router.post('/:projectId/loop-runs', (req, res) => {
         if (!(0, feature_flags_1.isLoopsEnabled)()) {
@@ -50,27 +61,31 @@ function registerLoopRunRoutes(deps) {
             res.status(400).json({ error: 'Loop must be published before it can run' });
             return;
         }
-        let effort;
-        if (reasoning_effort !== undefined && reasoning_effort !== null) {
-            if (typeof reasoning_effort !== 'string' || !VALID_REASONING_EFFORTS.has(reasoning_effort)) {
-                res.status(400).json({ error: 'reasoning_effort must be one of: low, medium, high' });
-                return;
-            }
-            effort = reasoning_effort;
-        }
         const check = (0, provider_selection_1.validateRequestedProvider)(c.project, aiEngine ?? providerAlias);
         if (!check.ok) {
             res.status(400).json({ error: check.error });
             return;
         }
         const provider = check.provider;
-        // claude-only guard (e.g. a loop that uses {{cmd:freestyle}}).
+        const adapter = (0, providers_1.getAdapter)(provider);
+        if (loop.graph.nodes.some((node) => node.type === 'decider')
+            && !(0, providers_1.supportsToolPolicy)(adapter, 'read-only')) {
+            res.status(409).json({
+                code: 'provider_tool_policy_unsupported',
+                provider,
+                requiredPolicy: 'read-only',
+                error: `Provider '${provider}' cannot run Loop Deciders because its headless CLI ` +
+                    'does not enforce a read-only tool policy.',
+            });
+            return;
+        }
+        // Provider-capability guard (e.g. a loop that uses {{cmd:freestyle}}).
         const promptsText = loop.graph.nodes
             .filter((n) => n.type === 'ai-step')
             .map((n) => String(n.data?.prompt ?? ''))
             .join('\n');
-        if ((0, loop_command_catalog_1.referencesClaudeOnlyCommand)(promptsText) && provider !== 'claude') {
-            res.status(400).json({ error: 'This loop uses a Claude-only command and requires the Claude provider' });
+        if ((0, loop_command_catalog_1.referencesUnsupportedProviderCommand)(promptsText, provider)) {
+            res.status(400).json({ error: `This loop uses a command unsupported by provider '${provider}'` });
             return;
         }
         // Optional explicit model — validated against the chosen provider's catalog
@@ -84,7 +99,20 @@ function registerLoopRunRoutes(deps) {
             model = requestedModel;
         }
         else {
-            model = (0, providers_1.getAdapter)(provider).defaultModel();
+            model = adapter.defaultModel();
+        }
+        let effort;
+        if (reasoning_effort !== undefined && reasoning_effort !== null) {
+            const allowed = (0, providers_1.reasoningEffortsForModel)(adapter, model);
+            if (typeof reasoning_effort !== 'string' ||
+                !allowed.includes(reasoning_effort)) {
+                res.status(400).json({
+                    error: `reasoning_effort is not valid for provider "${provider}" and model "${model}"`,
+                    allowed,
+                });
+                return;
+            }
+            effort = reasoning_effort;
         }
         const exec = (0, workspace_resolution_1.resolveProjectExecution)({ slug: c.project.slug, path: c.project.path });
         const runId = (0, ids_1.newId)();

package/server/dist/project-router-settings.js

@@ -14,6 +14,7 @@ const integration_branch_1 = require("./integration-branch");
 const worktree_manager_1 = require("./worktree-manager");
 const context_budget_1 = require("./context-budget");
 const context_scope_1 = require("./context-scope");
+const spec_models_1 = require("./spec-models");
 const terminal_settings_1 = require("./terminal-settings");
 const terminal_marks_store_1 = require("./terminal-marks-store");
 const project_router_helpers_1 = require("./project-router-helpers");
@@ -161,10 +162,14 @@ function registerSettingsRoutes(deps) {
     router.patch('/:projectId/agent-models', (req, res) => {
         const { project } = ctx(req);
         const { defaultModel, overrides } = req.body ?? {};
+        const provider = (project.provider ?? 'claude');
+        const allowedModels = (0, spec_models_1.getModelsForProvider)(provider).map((model) => model.value);
         // Validate defaultModel if provided
         if (defaultModel !== undefined) {
-            if (typeof defaultModel !== 'string' || !project_router_helpers_1.VALID_MODEL_ALIASES.includes(defaultModel)) {
-                res.status(400).json({ error: `Invalid model alias. Must be one of: ${project_router_helpers_1.VALID_MODEL_ALIASES.join(', ')}` });
+            if (!(0, spec_models_1.isValidModelForProvider)(defaultModel, provider)) {
+                res.status(400).json({
+                    error: `Invalid model alias for provider "${provider}". Catalog: ${allowedModels.join(', ')}`,
+                });
                 return;
             }
         }
@@ -175,8 +180,11 @@ function registerSettingsRoutes(deps) {
                 return;
             }
             for (const [agentName, modelValue] of Object.entries(overrides)) {
-                if (typeof modelValue !== 'string' || !project_router_helpers_1.VALID_MODEL_ALIASES.includes(modelValue)) {
-                    res.status(400).json({ error: `Invalid model alias for agent "${agentName}". Must be one of: ${project_router_helpers_1.VALID_MODEL_ALIASES.join(', ')}` });
+                if (!(0, spec_models_1.isValidModelForProvider)(modelValue, provider)) {
+                    res.status(400).json({
+                        error: `Invalid model alias for agent "${agentName}" and provider "${provider}". ` +
+                            `Catalog: ${allowedModels.join(', ')}`,
+                    });
                     return;
                 }
             }
@@ -185,12 +193,17 @@ function registerSettingsRoutes(deps) {
         // NEVER `<project>/.specrails` (which would leak into the user's repo).
         const configPath = (0, install_config_path_1.installConfigPath)(project);
         // Read existing config or build default shape
+        const providerDefault = (0, spec_models_1.getProviderDefault)(provider) || (0, spec_models_1.getProviderDefault)('claude');
         let existingConfig = {
             version: 1,
-            provider: 'claude',
+            provider,
             tier: 'quick',
             agents: { selected: [], excluded: [] },
-            models: { preset: 'balanced', defaults: { model: 'sonnet' }, overrides: {} },
+            models: {
+                preset: 'balanced',
+                defaults: { model: providerDefault },
+                overrides: {},
+            },
             agent_teams: false,
         };
         if (fs_1.default.existsSync(configPath)) {
@@ -198,9 +211,9 @@ function registerSettingsRoutes(deps) {
                 const text = fs_1.default.readFileSync(configPath, 'utf-8');
                 // Parse fields we care about from the existing config text
                 const versionMatch = text.match(/^version:\s*(\d+)/m);
-                const providerMatch = text.match(/^provider:\s*(\S+)/m);
                 const tierMatch = text.match(/^tier:\s*(\S+)/m);
                 const presetMatch = text.match(/preset:\s*(\S+)/);
+                const defaultModelMatch = text.match(/defaults:\s*\{\s*model:\s*(\S+?)\s*\}/);
                 const agentTeamsMatch = text.match(/^agent_teams:\s*(\S+)/m);
                 // Parse selected agents list
                 const selectedMatch = text.match(/selected:\s*\[([^\]]*)\]/);
@@ -219,18 +232,26 @@ function registerSettingsRoutes(deps) {
                     const overrideLines = block.match(/^ {2,}(\S+):\s*(\S+)/gm) ?? [];
                     for (const line of overrideLines) {
                         const m = line.match(/^\s+(\S+):\s*(\S+)/);
-                        if (m)
+                        if (m && (0, spec_models_1.isValidModelForProvider)(m[2], provider)) {
                             existingOverrides[m[1]] = m[2];
+                        }
                     }
                 }
+                const parsedDefaultModel = defaultModelMatch?.[1];
                 existingConfig = {
                     version: versionMatch ? parseInt(versionMatch[1], 10) : 1,
-                    provider: providerMatch ? providerMatch[1] : 'claude',
+                    // The project provider is authoritative. A stale shared config can
+                    // belong to another provider after a multi-provider setup pass.
+                    provider,
                     tier: tierMatch ? tierMatch[1] : 'quick',
                     agents: { selected: parsedSelected, excluded: parsedExcluded },
                     models: {
                         preset: presetMatch ? presetMatch[1] : 'balanced',
-                        defaults: { model: 'sonnet' },
+                        defaults: {
+                            model: parsedDefaultModel && (0, spec_models_1.isValidModelForProvider)(parsedDefaultModel, provider)
+                                ? parsedDefaultModel
+                                : providerDefault,
+                        },
                         overrides: existingOverrides,
                     },
                     agent_teams: agentTeamsMatch ? agentTeamsMatch[1] === 'true' : false,

package/server/dist/project-router-setup.js

@@ -12,7 +12,6 @@ const ids_1 = require("./ids");
 const db_1 = require("./db");
 const desktop_db_1 = require("./desktop-db");
 const queue_manager_1 = require("./queue-manager");
-const command_resolver_1 = require("./command-resolver");
 const changes_reader_1 = require("./changes-reader");
 const project_router_helpers_1 = require("./project-router-helpers");
 const install_config_path_1 = require("./install-config-path");
@@ -172,10 +171,10 @@ function registerSetupRoutes(deps) {
             res.status(400).json({ error: 'idea is required' });
             return;
         }
-        // Pre-check: does the propose-feature command exist in this project?
-        const testCmd = `/specrails:propose-feature test`;
-        const resolved = (0, command_resolver_1.resolveCommand)(testCmd, ctx(req).project.path);
-        if (resolved === testCmd) {
+        // Provider-aware pre-check. The manager resolves against the lazy
+        // execution cwd (including relocated workspaces) and understands Kimi's
+        // materialized headless skills rather than probing only Claude markdown.
+        if (!ctx(req).proposalManager.canStartExploration()) {
             res.status(400).json({ error: 'This project does not have the /specrails:propose-feature command installed. Run "npx specrails-core@latest" to update.' });
             return;
         }

package/server/dist/project-router-spending.js

@@ -361,12 +361,24 @@ function registerSpendingRoutes(deps) {
             // and skewed the day boundary by the tz offset, so the meter disagreed
             // with both the /analytics dashboard and Claude's per-day accounting.
             const { startIso, endIso } = localDayBoundsUtc(parseTzOffsetMinutes(req.query.tzOffsetMinutes));
-            const costRow = db.prepare(`SELECT COALESCE(SUM(total_cost_usd), 0) as costToday FROM ai_invocations WHERE started_at >= ? AND started_at < ?`).get(startIso, endIso);
+            const costRow = db.prepare(`SELECT
+           COALESCE(SUM(total_cost_usd), 0) as costToday,
+           COUNT(total_cost_usd) as pricedRuns,
+           SUM(CASE WHEN total_cost_usd IS NULL THEN 1 ELSE 0 END) as unpricedRuns
+         FROM ai_invocations WHERE started_at >= ? AND started_at < ?`).get(startIso, endIso);
             const costToday = costRow.costToday;
-            const budgetUtilizationPct = dailyBudgetUsd != null && dailyBudgetUsd > 0
+            const unpricedRuns = costRow.unpricedRuns ?? 0;
+            const budgetUtilizationPct = dailyBudgetUsd != null && dailyBudgetUsd > 0 && unpricedRuns === 0
                 ? (costToday / dailyBudgetUsd) * 100
                 : null;
-            res.json({ dailyBudgetUsd, jobCostThresholdUsd, costToday, budgetUtilizationPct });
+            res.json({
+                dailyBudgetUsd,
+                jobCostThresholdUsd,
+                costToday,
+                pricedRuns: costRow.pricedRuns,
+                unpricedRuns,
+                budgetUtilizationPct,
+            });
         }
         catch (err) {
             console.error('[project-router] budget get error:', err);