@pasko70/pibo 3.0.1 → 3.1.0

package/dist/loops/store.js

@@ -5,6 +5,12 @@ import { DatabaseSync } from 'node:sqlite';
 import { piboHomePath } from '../core/pibo-home.js';
 import { isPiboThinkingLevel } from '../core/thinking.js';
 import { addLoopAssistantUsage, newGoalTokenAccounting, normalizeLoopTokenAccounting } from './accounting.js';
+export class PiboLoopActiveRunModeChangeError extends Error {
+    constructor() {
+        super('Loop mode cannot be changed while a Loop run is active');
+        this.name = 'PiboLoopActiveRunModeChangeError';
+    }
+}
 function nowIso(now = new Date()) { return now.toISOString(); }
 function parseJson(json) { return JSON.parse(json); }
 function defaultName(prompt) { const normalized = prompt.replace(/\s+/g, ' ').trim(); return normalized ? normalized.slice(0, 80) : 'Loop job'; }
@@ -507,48 +513,56 @@ export class PiboLoopStore {
         return this.db.prepare(`SELECT * FROM pibo_ralph_jobs ${where} ORDER BY updated_at DESC, id ASC`).all(...values).map(jobFromRow);
     }
     updateJob(id, patch, now = new Date()) {
-        const existing = this.getJob(id);
-        if (!existing)
-            return undefined;
-        const runtimeOptions = normalizeRuntimeOptions({
-            modelOverride: hasOwn(patch, 'modelOverride') ? patch.modelOverride : existing.modelOverride,
-            thinkingLevel: hasOwn(patch, 'thinkingLevel') ? patch.thinkingLevel : existing.thinkingLevel,
-            fastMode: hasOwn(patch, 'fastMode') ? patch.fastMode : existing.fastMode,
-        });
-        const stopPolicy = hasOwn(patch, 'stopPolicy') ? normalizeLoopStopPolicy(patch.stopPolicy ?? undefined) : existing.stopPolicy;
-        const target = patch.target ? normalizeLoopTarget(patch.target) : existing.target;
-        const mode = patch.mode !== undefined ? normalizeLoopMode(patch.mode) : existing.mode;
-        const enabled = patch.enabled ?? existing.enabled;
-        let state = mode === existing.mode
-            ? { ...existing.state }
-            : { completedIterations: existing.state.completedIterations ?? 0, ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokenAccounting: newGoalTokenAccounting(), tokensUsed: 0, activeTimeSeconds: 0, ...(enabled ? { goalStartedAt: nowIso(now) } : {}) } : {}) };
-        if (mode === 'goal' && patch.enabled !== undefined) {
-            const currentGoalStatus = goalStatus({ mode, enabled: existing.enabled, state: existing.state }) ?? 'paused';
-            if (patch.enabled) {
-                if (currentGoalStatus === 'complete')
-                    throw new Error('Completed goals cannot be restarted; create a new goal');
-                const nextBudget = hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget;
-                const nextReserve = hasOwn(patch, 'tokenReserve') ? normalizeTokenReserve(patch.tokenReserve ?? undefined) : existing.tokenReserve;
-                if (currentGoalStatus === 'budget_limited' && nextBudget !== undefined && (existing.state.tokensUsed ?? 0) + (nextReserve ?? 0) >= nextBudget)
-                    throw new Error('Increase or clear the token budget, or lower the token reserve, before resuming this goal');
-                state.goalStatus = 'active';
-                state.goalStartedAt ??= nowIso(now);
-                delete state.goalEndedAt;
-                state.stopRequestedAt = undefined;
-                state.cancelRequestedAt = undefined;
-                state.lastFailure = undefined;
-                state.nextAttemptAt = undefined;
-                state.retryBackoffMs = undefined;
-                state.consecutiveErrors = 0;
+        this.db.exec('BEGIN IMMEDIATE');
+        try {
+            const existing = this.getJob(id);
+            if (!existing) {
+                this.db.exec('COMMIT');
+                return undefined;
             }
-            else {
-                state.goalStatus = currentGoalStatus === 'active' ? 'paused' : currentGoalStatus;
+            const runtimeOptions = normalizeRuntimeOptions({
+                modelOverride: hasOwn(patch, 'modelOverride') ? patch.modelOverride : existing.modelOverride,
+                thinkingLevel: hasOwn(patch, 'thinkingLevel') ? patch.thinkingLevel : existing.thinkingLevel,
+                fastMode: hasOwn(patch, 'fastMode') ? patch.fastMode : existing.fastMode,
+            });
+            const stopPolicy = hasOwn(patch, 'stopPolicy') ? normalizeLoopStopPolicy(patch.stopPolicy ?? undefined) : existing.stopPolicy;
+            const target = patch.target ? normalizeLoopTarget(patch.target) : existing.target;
+            const mode = patch.mode !== undefined ? normalizeLoopMode(patch.mode) : existing.mode;
+            if (mode !== existing.mode && this.db.prepare("SELECT 1 FROM pibo_ralph_runs WHERE job_id = ? AND status = 'running' LIMIT 1").get(id))
+                throw new PiboLoopActiveRunModeChangeError();
+            const enabled = patch.enabled ?? existing.enabled;
+            let state = mode === existing.mode
+                ? { ...existing.state }
+                : { completedIterations: existing.state.completedIterations ?? 0, ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokenAccounting: newGoalTokenAccounting(), tokensUsed: 0, activeTimeSeconds: 0, ...(enabled ? { goalStartedAt: nowIso(now) } : {}) } : {}) };
+            if (mode === 'goal' && patch.enabled !== undefined) {
+                const currentGoalStatus = goalStatus({ mode, enabled: existing.enabled, state: existing.state }) ?? 'paused';
+                if (patch.enabled) {
+                    if (isTerminalGoalStatus(currentGoalStatus))
+                        throw new Error('Terminal Goals cannot be restarted; use the confirmed Goal reopen operation');
+                    state.goalStatus = 'active';
+                    state.goalStartedAt ??= nowIso(now);
+                    delete state.goalEndedAt;
+                    state.stopRequestedAt = undefined;
+                    state.cancelRequestedAt = undefined;
+                    state.lastFailure = undefined;
+                    state.nextAttemptAt = undefined;
+                    state.retryBackoffMs = undefined;
+                    state.consecutiveErrors = 0;
+                }
+                else {
+                    state.goalStatus = currentGoalStatus === 'active' ? 'paused' : currentGoalStatus;
+                }
             }
+            const next = { ...existing, mode, state, name: patch.name !== undefined ? patch.name.trim() : existing.name, description: patch.description !== undefined ? patch.description?.trim() || undefined : existing.description, enabled, target, profile: patch.profile ?? existing.profile, prompt: patch.prompt ?? existing.prompt, maxIterations: hasOwn(patch, 'maxIterations') ? normalizeMaxIterations(patch.maxIterations ?? undefined) : existing.maxIterations, tokenBudget: mode === 'ralph' ? undefined : hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget, tokenReserve: mode === 'ralph' || (hasOwn(patch, 'tokenBudget') && patch.tokenBudget === null && !hasOwn(patch, 'tokenReserve')) ? undefined : hasOwn(patch, 'tokenReserve') ? normalizeTokenReserve(patch.tokenReserve ?? undefined) : existing.tokenReserve, stopPolicy, modelOverride: runtimeOptions.modelOverride, thinkingLevel: runtimeOptions.thinkingLevel, fastMode: runtimeOptions.fastMode, updatedAt: nowIso(now) };
+            validateJobInput(next);
+            this.writeJob(next);
+            this.db.exec('COMMIT');
+            return this.getJob(id);
+        }
+        catch (error) {
+            this.db.exec('ROLLBACK');
+            throw error;
         }
-        const next = { ...existing, mode, state, name: patch.name !== undefined ? patch.name.trim() : existing.name, description: patch.description !== undefined ? patch.description?.trim() || undefined : existing.description, enabled, target, profile: patch.profile ?? existing.profile, prompt: patch.prompt ?? existing.prompt, maxIterations: hasOwn(patch, 'maxIterations') ? normalizeMaxIterations(patch.maxIterations ?? undefined) : existing.maxIterations, tokenBudget: mode === 'ralph' ? undefined : hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget, tokenReserve: mode === 'ralph' || (hasOwn(patch, 'tokenBudget') && patch.tokenBudget === null && !hasOwn(patch, 'tokenReserve')) ? undefined : hasOwn(patch, 'tokenReserve') ? normalizeTokenReserve(patch.tokenReserve ?? undefined) : existing.tokenReserve, stopPolicy, modelOverride: runtimeOptions.modelOverride, thinkingLevel: runtimeOptions.thinkingLevel, fastMode: runtimeOptions.fastMode, updatedAt: nowIso(now) };
-        validateJobInput(next);
-        this.writeJob(next);
-        return this.getJob(id);
     }
     updateJobResources(id, resources, now = new Date()) {
         const existing = this.getJob(id);
@@ -621,6 +635,7 @@ export class PiboLoopStore {
         return Number(result.changes ?? 0) > 0 ? this.getRunByMessageEventId(eventId) : undefined;
     }
     reserveRun(id, now = new Date()) { this.updateJob(id, { enabled: true }, now); return this.reserveJob(id, now); }
+    reserveAdmittedRun(id, now = new Date()) { return this.reserveJob(id, now, true); }
     reserveDueRuns(limit, now = new Date()) {
         const rows = this.db.prepare('SELECT * FROM pibo_ralph_jobs WHERE enabled = 1 ORDER BY updated_at ASC').all();
         const result = [];
@@ -667,41 +682,47 @@ export class PiboLoopStore {
     }
     completeRun(input, now = new Date()) {
         const timestamp = nowIso(now);
-        const job = this.getJob(input.jobId);
-        if (!job)
-            return;
-        const completedIterations = (job.state.completedIterations ?? 0) + 1;
-        const reachedMaxIterations = job.maxIterations !== undefined && completedIterations >= job.maxIterations;
-        const currentGoalStatus = goalStatus(job);
-        const nextGoalStatus = job.mode === 'goal'
-            ? isTerminalGoalStatus(currentGoalStatus) || currentGoalStatus === 'paused'
-                ? currentGoalStatus
-                : input.goalStatus ?? currentGoalStatus
-            : undefined;
-        const terminalGoalStatus = job.mode === 'goal' && isTerminalGoalStatus(nextGoalStatus);
-        const shouldDisable = terminalGoalStatus || reachedMaxIterations || input.stopAfterRun === true || input.stopEvaluation?.finalAction === 'stop-after-run' || input.stopEvaluation?.finalAction === 'cancel-current-run';
-        const state = {
-            ...job.state,
-            ...(job.mode === 'goal' ? { activeTimeRunningAt: null } : {}),
-            runningAt: undefined,
-            completedIterations,
-            lastRunAt: timestamp,
-            lastRunId: input.runId,
-            lastStatus: input.status === 'error' ? 'error' : input.status === 'cancelled' ? 'cancelled' : 'ok',
-            lastError: input.error,
-            lastFailure: input.status === 'error' ? input.failure : undefined,
-            nextAttemptAt: input.status === 'error' ? input.failure?.nextAttemptAt : undefined,
-            retryBackoffMs: input.status === 'error' ? input.failure?.retryBackoffMs : undefined,
-            lastPiboSessionId: input.piboSessionId ?? job.state.lastPiboSessionId,
-            consecutiveErrors: input.status === 'error' ? (job.state.consecutiveErrors ?? 0) + 1 : 0,
-            conditionStates: input.conditionStates ?? job.state.conditionStates,
-            lastStopEvaluation: input.stopEvaluation ?? job.state.lastStopEvaluation,
-            ...(nextGoalStatus ? { goalStatus: nextGoalStatus } : {}),
-            ...(terminalGoalStatus ? { goalEndedAt: job.state.goalEndedAt ?? timestamp } : {}),
-        };
         this.db.exec('BEGIN IMMEDIATE');
         try {
-            this.db.prepare("UPDATE pibo_ralph_runs SET status = ?, pibo_session_id = COALESCE(?, pibo_session_id), reason = ?, error = ?, error_details_json = ?, message_state = CASE WHEN message_state = 'invalidated' THEN message_state ELSE 'finished' END, completed_at = ?, updated_at = ? WHERE id = ?").run(input.status, input.piboSessionId ?? null, input.reason ?? input.stopEvaluation?.reason ?? null, input.error ?? null, sessionErrorDetailsJson(input.errorDetails), timestamp, timestamp, input.runId);
+            const result = this.db.prepare("UPDATE pibo_ralph_runs SET status = ?, pibo_session_id = COALESCE(?, pibo_session_id), reason = ?, error = ?, error_details_json = ?, message_state = CASE WHEN message_state = 'invalidated' THEN message_state ELSE 'finished' END, completed_at = ?, updated_at = ? WHERE id = ? AND job_id = ? AND status = 'running'").run(input.status, input.piboSessionId ?? null, input.reason ?? input.stopEvaluation?.reason ?? null, input.error ?? null, sessionErrorDetailsJson(input.errorDetails), timestamp, timestamp, input.runId, input.jobId);
+            if (Number(result.changes ?? 0) === 0) {
+                this.db.exec('COMMIT');
+                return;
+            }
+            const job = this.getJob(input.jobId);
+            if (!job || !job.state.runningAt || job.state.lastRunId !== input.runId) {
+                this.db.exec('COMMIT');
+                return;
+            }
+            const completedIterations = (job.state.completedIterations ?? 0) + 1;
+            const reachedMaxIterations = job.maxIterations !== undefined && completedIterations >= job.maxIterations;
+            const currentGoalStatus = goalStatus(job);
+            const nextGoalStatus = job.mode === 'goal'
+                ? isTerminalGoalStatus(currentGoalStatus) || currentGoalStatus === 'paused'
+                    ? currentGoalStatus
+                    : input.goalStatus ?? currentGoalStatus
+                : undefined;
+            const terminalGoalStatus = job.mode === 'goal' && isTerminalGoalStatus(nextGoalStatus);
+            const shouldDisable = terminalGoalStatus || reachedMaxIterations || input.stopAfterRun === true || input.stopEvaluation?.finalAction === 'stop-after-run' || input.stopEvaluation?.finalAction === 'cancel-current-run';
+            const state = {
+                ...job.state,
+                ...(job.mode === 'goal' ? { activeTimeRunningAt: null } : {}),
+                runningAt: undefined,
+                completedIterations,
+                lastRunAt: timestamp,
+                lastRunId: input.runId,
+                lastStatus: input.status === 'error' ? 'error' : input.status === 'cancelled' ? 'cancelled' : 'ok',
+                lastError: input.error,
+                lastFailure: input.status === 'error' ? input.failure : undefined,
+                nextAttemptAt: input.status === 'error' ? input.failure?.nextAttemptAt : undefined,
+                retryBackoffMs: input.status === 'error' ? input.failure?.retryBackoffMs : undefined,
+                lastPiboSessionId: input.piboSessionId ?? job.state.lastPiboSessionId,
+                consecutiveErrors: input.status === 'error' ? (job.state.consecutiveErrors ?? 0) + 1 : 0,
+                conditionStates: input.conditionStates ?? job.state.conditionStates,
+                lastStopEvaluation: input.stopEvaluation ?? job.state.lastStopEvaluation,
+                ...(nextGoalStatus ? { goalStatus: nextGoalStatus } : {}),
+                ...(terminalGoalStatus ? { goalEndedAt: job.state.goalEndedAt ?? timestamp } : {}),
+            };
             this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = ?, state_json = ?, updated_at = ? WHERE id = ?').run(shouldDisable ? 0 : job.enabled ? 1 : 0, JSON.stringify(state), timestamp, job.id);
             this.db.exec('COMMIT');
         }
@@ -768,12 +789,17 @@ export class PiboLoopStore {
         this.updateRunResources({ jobId: job.id, runId, resources: nextResources });
         this.updateJobResources(job.id, nextResources);
     }
-    reserveJob(id, now = new Date()) {
+    reserveJob(id, now = new Date(), requireAdmission = false) {
         const timestamp = nowIso(now);
         this.db.exec('BEGIN IMMEDIATE');
         try {
             const job = this.getJob(id);
-            if (!job || !job.enabled || job.state.runningAt) {
+            if (!job || !job.enabled || job.state.runningAt || (requireAdmission && job.state.cancelRequestedAt !== undefined)) {
+                this.db.exec('COMMIT');
+                return undefined;
+            }
+            if (job.maxIterations !== undefined && (job.state.completedIterations ?? 0) >= job.maxIterations) {
+                this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = 0, updated_at = ? WHERE id = ?').run(timestamp, job.id);
                 this.db.exec('COMMIT');
                 return undefined;
             }

package/dist/mcp/agent-context.js

@@ -1,5 +1,5 @@
-import { readFile, writeFile } from 'node:fs/promises';
-import { ensureConfigExists, isHttpServer, loadConfigUnresolved, } from './config.js';
+import { stat, writeFile } from 'node:fs/promises';
+import { isHttpServer, loadConfigUnresolved, resolveMcpServerConfigSource, } from './config.js';
 import { ErrorCode, formatCliError } from './errors.js';
 export const MCP_SERVER_DESCRIPTION_MAX_LENGTH = 480;
 export const ENABLED_MCP_SERVERS_CONTEXT_PATH = '.pibo/context/enabled-mcp-servers.md';
@@ -34,15 +34,19 @@ export async function listMcpServerInfos(configPath) {
 }
 export async function setMcpServerDescription(serverName, descriptionInput, configPath) {
     const description = normalizeMcpServerDescription(descriptionInput);
-    const path = await ensureConfigExists(configPath);
-    const config = await readMcpConfig(path);
-    const server = config.mcpServers[serverName];
-    if (!server) {
+    const { path, config, server } = await resolveMcpServerConfigSource(serverName, configPath);
+    if (server.pibo?.descriptionSource === 'registry') {
         throw new Error(formatCliError({
             code: ErrorCode.CLIENT_ERROR,
-            type: 'SERVER_NOT_FOUND',
-            message: `Server "${serverName}" not found in config`,
-            details: `Available servers: ${Object.keys(config.mcpServers).join(', ') || '(none)'}`,
+            type: 'MCP_DESCRIPTION_READ_ONLY',
+            message: `Server "${serverName}" description is read-only`,
+        }));
+    }
+    if (process.platform !== 'win32' && ((await stat(path)).mode & 0o222) === 0) {
+        throw new Error(formatCliError({
+            code: ErrorCode.CLIENT_ERROR,
+            type: 'MCP_CONFIG_READ_ONLY',
+            message: `Server "${serverName}" config is read-only`,
         }));
     }
     server.pibo = {
@@ -91,23 +95,6 @@ export function getMcpAgentContextFileFromConfig(selectedServerNames, config) {
         ].join('\n').trimEnd(),
     };
 }
-async function readMcpConfig(path) {
-    const content = await readFile(path, 'utf-8');
-    const parsed = JSON.parse(content);
-    if (!parsed ||
-        typeof parsed !== 'object' ||
-        !('mcpServers' in parsed) ||
-        typeof parsed.mcpServers !== 'object' ||
-        parsed.mcpServers === null) {
-        throw new Error(formatCliError({
-            code: ErrorCode.CLIENT_ERROR,
-            type: 'CONFIG_MISSING_FIELD',
-            message: 'Config file missing required "mcpServers" object',
-            details: `File: ${path}`,
-        }));
-    }
-    return parsed;
-}
 function mcpServerInfoFromConfig(name, server) {
     const metadata = normalizeMetadata(server.pibo);
     const description = metadata.description;

package/dist/mcp/commands/info.js

@@ -28,7 +28,9 @@ export async function infoCommand(options) {
         process.exit(ErrorCode.CLIENT_ERROR);
     }
     const { server: serverName, tool: toolName } = parseTarget(options.target);
-    const serverConfig = config.mcpServers[serverName];
+    const serverConfig = Object.hasOwn(config.mcpServers, serverName)
+        ? config.mcpServers[serverName]
+        : undefined;
     if (!serverConfig) {
         const available = Object.keys(config.mcpServers);
         const serverList = available.length > 0 ? available.join(', ') : '(none)';

package/dist/mcp/config-command.js

@@ -1,6 +1,9 @@
 import { existsSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
-import { ensureConfigExists, findConfigPath, getPreferredConfigPath, } from './config.js';
+import { resolve } from 'node:path';
+import { CustomAgentStore } from '../apps/chat/agent-store.js';
+import { piboHomePath } from '../core/pibo-home.js';
+import { ensureConfigExists, findConfigPath, getConfigSearchPaths, getPreferredConfigPath, } from './config.js';
 import { ErrorCode, formatCliError } from './errors.js';
 import { setMcpServerDescription } from './agent-context.js';
 const EXAMPLE_CONFIG = {
@@ -97,6 +100,35 @@ async function readRawConfig(path) {
 async function writeRawConfig(path, config) {
     await writeFile(path, `${JSON.stringify(config, null, 2)}\n`);
 }
+async function mergedConfigRetainsServer(name, updatedPath, updatedConfig, explicitPath) {
+    const resolvedUpdatedPath = resolve(updatedPath);
+    for (const sourcePath of getConfigSearchPaths(explicitPath)) {
+        if (!existsSync(sourcePath))
+            continue;
+        const sourceConfig = resolve(sourcePath) === resolvedUpdatedPath
+            ? updatedConfig
+            : await readRawConfig(sourcePath);
+        if (Object.hasOwn(sourceConfig.mcpServers, name))
+            return true;
+    }
+    return false;
+}
+function customAgentsSelectingMcpServer(name) {
+    const storePath = piboHomePath('chat-agents.sqlite');
+    if (!existsSync(storePath))
+        return [];
+    const store = new CustomAgentStore(storePath);
+    try {
+        return store
+            .list({ includeArchived: true })
+            .filter((agent) => agent.mcpServers.includes(name))
+            .map((agent) => agent.profileName)
+            .sort((left, right) => left.localeCompare(right));
+    }
+    finally {
+        store.close();
+    }
+}
 function parseServerConfig(input) {
     let parsed;
     try {
@@ -205,7 +237,7 @@ export async function configCommand(options) {
                 suggestion: 'Example: pibo mcp config remove filesystem',
             }));
         }
-        if (!(options.name in config.mcpServers)) {
+        if (!Object.hasOwn(config.mcpServers, options.name)) {
             throw new Error(formatCliError({
                 code: ErrorCode.CLIENT_ERROR,
                 type: 'SERVER_NOT_FOUND',
@@ -214,6 +246,18 @@ export async function configCommand(options) {
             }));
         }
         delete config.mcpServers[options.name];
+        if (!(await mergedConfigRetainsServer(options.name, path, config, options.configPath))) {
+            const affectedAgents = customAgentsSelectingMcpServer(options.name);
+            if (affectedAgents.length > 0) {
+                throw new Error(formatCliError({
+                    code: ErrorCode.CLIENT_ERROR,
+                    type: 'MCP_SERVER_IN_USE',
+                    message: `MCP server "${options.name}" is selected by custom agents`,
+                    details: `Custom agents: ${affectedAgents.join(', ')}`,
+                    suggestion: 'Update those agents to stop selecting this MCP server, then retry the removal.',
+                }));
+            }
+        }
         await writeRawConfig(path, config);
         console.log(`Removed MCP server "${options.name}" from ${path}`);
     }

package/dist/mcp/config.js

@@ -496,7 +496,7 @@ export async function loadConfigUnresolved(explicitPath) {
     for (const configPath of existingPaths) {
         const config = await readRawConfig(configPath);
         for (const [serverName, serverConfig] of Object.entries(config.mcpServers)) {
-            if (!(serverName in merged.mcpServers)) {
+            if (!Object.hasOwn(merged.mcpServers, serverName)) {
                 merged.mcpServers[serverName] = serverConfig;
             }
         }
@@ -506,6 +506,21 @@ export async function loadConfigUnresolved(explicitPath) {
     }
     return merged;
 }
+/**
+ * Resolve the highest-priority config file that contributes a merged server.
+ */
+export async function resolveMcpServerConfigSource(serverName, explicitPath) {
+    const merged = await loadConfigUnresolved(explicitPath);
+    for (const configPath of getConfigSearchPaths(explicitPath)) {
+        if (!existsSync(configPath))
+            continue;
+        const config = await readRawConfig(configPath);
+        if (Object.hasOwn(config.mcpServers, serverName)) {
+            return { path: configPath, config, server: config.mcpServers[serverName] };
+        }
+    }
+    throw new Error(formatCliError(serverNotFoundError(serverName, Object.keys(merged.mcpServers))));
+}
 export async function loadConfig(explicitPath) {
     return substituteEnvVarsInObject(await loadConfigUnresolved(explicitPath));
 }
@@ -539,12 +554,11 @@ export function formatConfigSourceSummaries(summaries) {
  * Get a specific server config by name
  */
 export function getServerConfig(config, serverName) {
-    const server = config.mcpServers[serverName];
-    if (!server) {
+    if (!Object.hasOwn(config.mcpServers, serverName)) {
         const available = Object.keys(config.mcpServers);
         throw new Error(formatCliError(serverNotFoundError(serverName, available)));
     }
-    return server;
+    return config.mcpServers[serverName];
 }
 /**
  * List all server names

package/dist/plugins/context-files-store.js

@@ -101,6 +101,36 @@ function revisionRowToRecord(row) {
         ...(row.actor_id ? { actorId: row.actor_id } : {}),
     };
 }
+export function readContextFileCatalog(path) {
+    const resolvedPath = resolve(path);
+    if (!existsSync(resolvedPath))
+        return [];
+    const db = new DatabaseSync(resolvedPath, { readOnly: true });
+    try {
+        const table = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'context_files'").get();
+        if (!table)
+            return [];
+        const columns = new Set(db.prepare("PRAGMA table_info(context_files)").all().map((column) => column.name));
+        const required = ["key", "label", "managed_path", "scope", "agent_profile_name"];
+        if (!required.every((column) => columns.has(column)))
+            return [];
+        const rows = db.prepare(`
+			SELECT key, label, managed_path, scope, agent_profile_name
+			FROM context_files
+			ORDER BY updated_at DESC
+		`).all();
+        return rows.map((row) => ({
+            key: row.key,
+            label: row.label,
+            managedPath: row.managed_path,
+            scope: row.scope,
+            ...(row.agent_profile_name ? { agentProfileName: row.agent_profile_name } : {}),
+        }));
+    }
+    finally {
+        db.close();
+    }
+}
 export class ContextFileMetadataStore {
     legacyStorePath;
     db;
@@ -415,6 +445,12 @@ export class ContextFileMetadataStore {
 					WHERE key = ?
 				`).run(file.workingContent, file.sourceContent ?? null, file.key);
             }
+            for (const file of recovered) {
+                if (!file.restoreManagedFile)
+                    continue;
+                mkdirSync(dirname(file.managedPath), { recursive: true });
+                writeFileSync(file.managedPath, file.workingContent, "utf8");
+            }
             const migratedAt = new Date().toISOString();
             this.db.prepare(`
 				INSERT INTO context_file_store_meta (key, value) VALUES (?, ?)
@@ -430,12 +466,6 @@ export class ContextFileMetadataStore {
             this.db.exec("ROLLBACK");
             throw error;
         }
-        for (const file of recovered) {
-            if (!file.restoreManagedFile)
-                continue;
-            mkdirSync(dirname(file.managedPath), { recursive: true });
-            writeFileSync(file.managedPath, file.workingContent, "utf8");
-        }
     }
     migrateLegacyStore() {
         if (!this.legacyStorePath)

package/dist/plugins/context-files.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import { readFallbackPidFile, readPidFile } from "../gateway/pidfile.js";
 import { PiboWebHttpError, readJsonBody, responseHtml, responseJson } from "../web/http.js";
 import { definePiboPlugin } from "./registry.js";
-import { buildContextFileDiff, ContextFileMetadataStore, hashContextFileContent, } from "./context-files-store.js";
+import { buildContextFileDiff, ContextFileMetadataStore, hashContextFileContent, readContextFileCatalog, } from "./context-files-store.js";
 export const CONTEXT_FILES_APP_NAME = "pibo.context-files";
 export const CONTEXT_FILES_MOUNT_PATH = "/apps/context-files";
 export const CONTEXT_FILES_API_PREFIX = "/api/context-files";
@@ -1028,6 +1028,57 @@ function createContextFilesWebApp(service) {
         },
     };
 }
+export function createPiboContextFilesCatalogPlugin(options = {}) {
+    const paths = resolveContextFilesPaths(options);
+    return definePiboPlugin({
+        id: "pibo.context-files-catalog",
+        name: "Pibo Context Files Catalog",
+        register(api) {
+            const registeredPaths = new Set();
+            const registeredKeys = new Set();
+            try {
+                for (const file of readContextFileCatalog(paths.metadataPath)) {
+                    api.upsertContextFile(profileForManaged(file));
+                    registeredPaths.add(resolve(file.managedPath));
+                    registeredKeys.add(file.key);
+                }
+            }
+            catch (error) {
+                console.warn(`[pibo] Skipping managed context-file catalog registration: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            let entries = [];
+            try {
+                entries = readdirSync(paths.globalDir, { withFileTypes: true });
+            }
+            catch (error) {
+                const code = error && typeof error === "object" && "code" in error ? error.code : undefined;
+                if (code !== "ENOENT") {
+                    console.warn(`[pibo] Skipping global context-file discovery: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+            const usedKeys = new Set(registeredKeys);
+            for (const entry of entries) {
+                if (!entry.isFile())
+                    continue;
+                const extension = extname(entry.name).toLowerCase();
+                if (extension !== ".md" && extension !== ".markdown")
+                    continue;
+                const path = resolve(paths.globalDir, entry.name);
+                if (registeredPaths.has(path))
+                    continue;
+                const key = uniqueKey(`ctx:${slugSegment(entry.name.slice(0, -extension.length) || entry.name)}`, usedKeys);
+                usedKeys.add(key);
+                api.upsertContextFile({
+                    key,
+                    label: labelFromManagedPath(entry.name),
+                    path,
+                    source: "managed",
+                    scope: "global",
+                });
+            }
+        },
+    });
+}
 export function createPiboContextFilesPlugin(options = {}) {
     const paths = resolveContextFilesPaths(options);
     return definePiboPlugin({

package/dist/plugins/registry.js

@@ -521,11 +521,13 @@ export class PiboPluginRegistry {
                 nativeTools: sessionContext.tools.filter((tool) => tool.enabled !== false).map((tool) => tool.name),
                 skills: sessionContext.skills.filter((skill) => skill.enabled !== false).map((skill) => skill.name),
                 contextFiles: sessionContext.contextFiles.filter((contextFile) => contextFile.enabled !== false).map(contextFileKey),
+                diagnostics: sessionContext.diagnostics.map((diagnostic) => ({ ...diagnostic })),
                 subagents: sessionContext.subagents.filter((subagent) => subagent.enabled !== false),
                 mcpServers: [...sessionContext.mcpServers],
                 piPackages: sessionContext.piPackages.filter((pkg) => pkg.enabled !== false).map((pkg) => pkg.id),
                 model: sessionContext.model ? { ...sessionContext.model } : undefined,
                 mainModel: sessionContext.mainModel ? { ...sessionContext.mainModel } : undefined,
+                mainModelFallbacks: sessionContext.mainModelFallbacks.map((model) => ({ ...model })),
                 subagentModel: sessionContext.subagentModel ? { ...sessionContext.subagentModel } : undefined,
                 thinkingLevel: sessionContext.thinkingLevel,
                 mainThinkingLevel: sessionContext.mainThinkingLevel,

package/dist/plugins/user-profile-resources.js

@@ -0,0 +1,22 @@
+import { createPiboChatCustomAgentProfilesPlugin, } from "./chat-custom-agents.js";
+import { createPiboChatUserSkillsPlugin } from "./chat-user-skills.js";
+import { createPiboContextFilesCatalogPlugin, createPiboContextFilesPlugin, } from "./context-files.js";
+import { createDefaultPiboPluginRegistry } from "./builtin.js";
+export function createPiboUserProfileResourcePlugins(options = {}) {
+    return [
+        createPiboChatUserSkillsPlugin(options.userSkills),
+        options.contextFilesMode === "catalog"
+            ? createPiboContextFilesCatalogPlugin(options.contextFiles)
+            : createPiboContextFilesPlugin(options.contextFiles),
+        createPiboChatCustomAgentProfilesPlugin(options.customAgents),
+    ];
+}
+export function createDefaultPiboUserProfileRegistry(options = {}) {
+    const registry = createDefaultPiboPluginRegistry();
+    registerPiboUserProfileResources(registry, { contextFilesMode: "catalog", ...options });
+    return registry;
+}
+export function registerPiboUserProfileResources(registry, options = {}) {
+    for (const plugin of createPiboUserProfileResourcePlugins(options))
+        registry.registerPlugin(plugin);
+}

package/dist/previews/base-url.js

@@ -0,0 +1,34 @@
+import { isIP } from "node:net";
+function isLocalPreviewHostname(hostname) {
+    return hostname === "localhost" || hostname.endsWith(".localhost");
+}
+function isValidDnsHostname(hostname) {
+    return isIP(hostname) === 0 &&
+        hostname.length <= 253 &&
+        !hostname.endsWith(".") &&
+        hostname.split(".").every((label) => label.length >= 1 &&
+            label.length <= 63 &&
+            /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i.test(label));
+}
+export function parsePreviewBaseURL(value) {
+    let url;
+    try {
+        url = new URL(value);
+    }
+    catch {
+        throw new Error("preview.baseURL must be an absolute HTTP or HTTPS URL");
+    }
+    if (url.protocol !== "http:" && url.protocol !== "https:") {
+        throw new Error("preview.baseURL must use http or https");
+    }
+    if (url.username || url.password || url.pathname !== "/" || url.search || url.hash) {
+        throw new Error("preview.baseURL must contain only scheme, hostname, and optional port");
+    }
+    if (!isValidDnsHostname(url.hostname)) {
+        throw new Error("preview.baseURL hostname must be a DNS hostname without wildcards, IP literals, or a trailing dot");
+    }
+    if (url.protocol === "http:" && !isLocalPreviewHostname(url.hostname)) {
+        throw new Error("preview.baseURL must use https except for localhost development");
+    }
+    return url;
+}