@pellux/goodvibes-agent 0.1.116 → 1.0.0

package/src/input/commands/knowledge.ts

@@ -1,4 +1,4 @@
-import type { KnowledgeService } from '@pellux/goodvibes-sdk/platform/knowledge';
+import type { KnowledgeMapResult, KnowledgeService } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { BrowserKnowledgeKind, BrowserKnowledgeSourceKind } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { CommandContext, SlashCommand } from '../command-registry.ts';
 import { requireYesFlag, stripYesFlag } from './confirmation.ts';
@@ -12,10 +12,14 @@ type KnowledgeAskInput = Parameters<KnowledgeService['ask']>[0];
 type KnowledgeAskResult = Awaited<ReturnType<KnowledgeService['ask']>>;
 type KnowledgeAskMode = NonNullable<KnowledgeAskInput['mode']>;
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
 function requireAgentKnowledgeApi(context: CommandContext) {
   const knowledgeApi = context.clients?.agentKnowledgeApi;
   if (!knowledgeApi) {
-    context.print('[knowledge] Agent Knowledge API is not available in this runtime. Refusing to use default Knowledge/Wiki or non-Agent knowledge fallback.');
+    context.print('[knowledge] Agent Knowledge API is not available in this runtime. Refusing to use default knowledge or non-Agent knowledge fallback.');
     return null;
   }
   return knowledgeApi;
@@ -48,7 +52,7 @@ function findDisallowedKnowledgeScopeFlag(args: readonly string[]): string | nul
 function printScopeFlagRejection(context: CommandContext, flag: string): void {
   context.print([
     `[knowledge] Agent Knowledge is isolated; ${flag} is not accepted.`,
-    '[knowledge] GoodVibes Agent must not use default Knowledge/Wiki or non-Agent product spaces.',
+    '[knowledge] GoodVibes Agent must not use default knowledge or non-Agent product spaces.',
     '[knowledge] Use only /api/goodvibes-agent/knowledge/* Agent-owned routes.',
   ].join('\n'));
 }
@@ -110,10 +114,7 @@ function readJsonObjectFlag(args: string[], name: string): Record<string, unknow
   if (!value) return undefined;
   try {
     const parsed = JSON.parse(value) as unknown;
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-      return null;
-    }
-    return parsed as Record<string, unknown>;
+    return isRecord(parsed) ? parsed : null;
   } catch {
     return null;
   }
@@ -131,7 +132,7 @@ function requireAgentKnowledgeAsk(context: CommandContext): ((input: KnowledgeAs
   const serviceAsk = context.extensions.agentKnowledgeService?.ask?.bind(context.extensions.agentKnowledgeService);
   if (serviceAsk) return serviceAsk;
 
-  context.print('[knowledge] Agent Knowledge ask is not available in this runtime. Refusing to use default Knowledge/Wiki or non-Agent knowledge fallback.');
+  context.print('[knowledge] Agent Knowledge ask is not available in this runtime. Refusing to use default knowledge or non-Agent knowledge fallback.');
   return null;
 }
 
@@ -139,11 +140,20 @@ function cleanInline(value: unknown): string {
   return typeof value === 'string' ? value.replace(/\s+/g, ' ').trim() : '';
 }
 
+function formatKnowledgeMap(result: KnowledgeMapResult): string {
+  return [
+    'Agent Knowledge map',
+    `  nodes: ${result.nodeCount}${result.totalNodeCount !== undefined && result.totalNodeCount !== result.nodeCount ? ` of ${result.totalNodeCount}` : ''}`,
+    `  edges: ${result.edgeCount}${result.totalEdgeCount !== undefined && result.totalEdgeCount !== result.edgeCount ? ` of ${result.totalEdgeCount}` : ''}`,
+    '  route /api/goodvibes-agent/knowledge/map',
+  ].join('\n');
+}
+
 function nodeLabel(node: { readonly kind?: string; readonly title?: string; readonly summary?: string; readonly confidence?: number }): string {
   const kind = cleanInline(node.kind) || 'node';
   const title = cleanInline(node.title) || 'untitled';
   const summary = cleanInline(node.summary);
-  const confidence = typeof node.confidence === 'number' ? ` confidence=${node.confidence}` : '';
+  const confidence = typeof node.confidence === 'number' ? `  confidence ${node.confidence}` : '';
   return summary ? `[${kind}] ${title}${confidence} - ${summary}` : `[${kind}] ${title}${confidence}`;
 }
 
@@ -170,7 +180,7 @@ function renderKnowledgeAskResult(result: KnowledgeAskResult): string {
     `[knowledge] ${result.query}`,
     answer.text,
     '',
-    `mode: ${answer.mode}  confidence: ${answer.confidence}  synthesized: ${answer.synthesized ? 'yes' : 'no'}`,
+    `mode ${answer.mode}  confidence ${answer.confidence}  synthesized ${answer.synthesized ? 'yes' : 'no'}`,
   ];
 
   if (answer.sources.length > 0) {
@@ -199,16 +209,16 @@ function renderKnowledgeAskResult(result: KnowledgeAskResult): string {
 export const knowledgeCommand: SlashCommand = {
   name: 'knowledge',
   aliases: ['know', 'kb'],
-  description: 'Agent Knowledge/Wiki: isolated Agent-owned sources, graph, review queue, and compact prompt packets.',
+  description: 'Agent Knowledge: isolated Agent-owned sources, graph, review queue, and compact prompt packets.',
   usage: '<subcommand> [args]',
   argsHint: 'status|ask|ingest-url --yes|ingest-file --yes|import-bookmarks --yes|list|search|get|queue|review-issue --yes',
   handler: async (args: string[], context: CommandContext): Promise<void> => {
-    const knowledge = requireAgentKnowledgeApi(context);
-    if (!knowledge) {
+    if (args.length === 0 && context.openAgentWorkspace) {
+      context.openAgentWorkspace('knowledge');
       return;
     }
-    if (args.length === 0 && context.openKnowledgePanel) {
-      context.openKnowledgePanel();
+    const knowledge = requireAgentKnowledgeApi(context);
+    if (!knowledge) {
       return;
     }
     const sub = (args[0] ?? 'status').toLowerCase();
@@ -321,9 +331,9 @@ export const knowledgeCommand: SlashCommand = {
           return;
         }
         const result = await knowledge.ingest.bookmarksFile({ path, sessionId: context.session.runtime.sessionId });
-        context.print(`[knowledge] Imported bookmarks: ${result.imported} ok, ${result.failed} failed`);
+        context.print(`[knowledge] Imported bookmarks ${result.imported} ok, ${result.failed} failed`);
         if (result.errors.length > 0) {
-          for (const error of result.errors.slice(0, 10)) context.print(`  error: ${error}`);
+          for (const error of result.errors.slice(0, 10)) context.print(`  error ${error}`);
         }
         break;
       }
@@ -339,9 +349,9 @@ export const knowledgeCommand: SlashCommand = {
           return;
         }
         const result = await knowledge.ingest.urlsFile({ path, sessionId: context.session.runtime.sessionId });
-        context.print(`[knowledge] Imported URL list: ${result.imported} ok, ${result.failed} failed`);
+        context.print(`[knowledge] Imported URL list ${result.imported} ok, ${result.failed} failed`);
         if (result.errors.length > 0) {
-          for (const error of result.errors.slice(0, 10)) context.print(`  error: ${error}`);
+          for (const error of result.errors.slice(0, 10)) context.print(`  error ${error}`);
         }
         break;
       }
@@ -362,9 +372,9 @@ export const knowledgeCommand: SlashCommand = {
           sessionId: context.session.runtime.sessionId,
         });
         context.print(`[knowledge] Imported browser knowledge: ${result.imported} ok, ${result.failed} failed`);
-        if (result.profiles.length > 0) context.print(`  profiles: ${result.profiles.length}`);
+        if (result.profiles.length > 0) context.print(`  profiles ${result.profiles.length}`);
         if (result.errors.length > 0) {
-          for (const error of result.errors.slice(0, 10)) context.print(`  error: ${error}`);
+          for (const error of result.errors.slice(0, 10)) context.print(`  error ${error}`);
         }
         break;
       }
@@ -396,7 +406,7 @@ export const knowledgeCommand: SlashCommand = {
         });
         context.print(`[knowledge] Imported connector input: ${result.imported} ok, ${result.failed} failed`);
         if (result.errors.length > 0) {
-          for (const error of result.errors.slice(0, 10)) context.print(`  error: ${error}`);
+          for (const error of result.errors.slice(0, 10)) context.print(`  error ${error}`);
         }
         break;
       }
@@ -410,7 +420,7 @@ export const knowledgeCommand: SlashCommand = {
             context.print('[knowledge] No nodes.');
             return;
           }
-          context.print(`[knowledge] ${nodes.length} node(s):`);
+          context.print(`[knowledge] ${nodes.length} node(s)`);
           for (const node of nodes) {
             context.print(`  ${node.id} [${node.kind}] ${node.title}`);
             if (node.summary) context.print(`    ${node.summary}`);
@@ -423,7 +433,7 @@ export const knowledgeCommand: SlashCommand = {
             context.print('[knowledge] No issues.');
             return;
           }
-          context.print(`[knowledge] ${issues.length} issue(s):`);
+          context.print(`[knowledge] ${issues.length} issue(s)`);
           for (const issue of issues) {
             context.print(`  ${issue.id} [${issue.severity}] ${issue.code}`);
             context.print(`    ${issue.message}`);
@@ -435,7 +445,7 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No sources.');
           return;
         }
-        context.print(`[knowledge] ${sources.length} source(s):`);
+        context.print(`[knowledge] ${sources.length} source(s)`);
         for (const source of sources) {
           context.print(`  ${source.id} [${source.sourceType}/${source.status}] ${source.title ?? source.canonicalUri ?? source.sourceUri ?? 'untitled'}`);
           if (source.summary) context.print(`    ${source.summary}`);
@@ -456,10 +466,10 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No results.');
           return;
         }
-        context.print(`[knowledge] ${results.length} result(s):`);
+        context.print(`[knowledge] ${results.length} result(s)`);
         for (const result of results) {
           const title = result.source?.title ?? result.source?.canonicalUri ?? result.node?.title ?? result.id;
-          context.print(`  ${result.id} [${result.kind}] score=${result.score} ${title}`);
+          context.print(`  ${result.id} [${result.kind}] score ${result.score} ${title}`);
           context.print(`    ${result.reason}`);
         }
         break;
@@ -473,28 +483,28 @@ export const knowledgeCommand: SlashCommand = {
         }
         const item = knowledge.graph.items.get(id);
         if (!item) {
-          context.print(`[knowledge] Unknown item: ${id}`);
+          context.print(`[knowledge] Unknown item ${id}`);
           return;
         }
         if (item.source) {
           context.print(`[knowledge] source ${item.source.id}`);
-          context.print(`  title: ${item.source.title ?? 'untitled'}`);
-          context.print(`  uri: ${item.source.canonicalUri ?? item.source.sourceUri ?? 'n/a'}`);
-          context.print(`  status: ${item.source.status}`);
-          if (item.source.summary) context.print(`  summary: ${item.source.summary}`);
+          context.print(`  title ${item.source.title ?? 'untitled'}`);
+          context.print(`  uri ${item.source.canonicalUri ?? item.source.sourceUri ?? 'n/a'}`);
+          context.print(`  status ${item.source.status}`);
+          if (item.source.summary) context.print(`  summary ${item.source.summary}`);
         } else if (item.node) {
           context.print(`[knowledge] node ${item.node.id}`);
-          context.print(`  kind: ${item.node.kind}`);
-          context.print(`  title: ${item.node.title}`);
-          if (item.node.summary) context.print(`  summary: ${item.node.summary}`);
+          context.print(`  type ${item.node.kind}`);
+          context.print(`  title ${item.node.title}`);
+          if (item.node.summary) context.print(`  summary ${item.node.summary}`);
         } else if (item.issue) {
           context.print(`[knowledge] issue ${item.issue.id}`);
-          context.print(`  severity: ${item.issue.severity}`);
-          context.print(`  code: ${item.issue.code}`);
-          context.print(`  message: ${item.issue.message}`);
+          context.print(`  severity ${item.issue.severity}`);
+          context.print(`  code ${item.issue.code}`);
+          context.print(`  message ${item.issue.message}`);
         }
         if (item.relatedEdges.length > 0) {
-          context.print('  relations:');
+          context.print('  relations');
           for (const edge of item.relatedEdges.slice(0, 12)) {
             context.print(`    ${edge.fromKind}:${edge.fromId} -[${edge.relation}]-> ${edge.toKind}:${edge.toId}`);
           }
@@ -502,13 +512,24 @@ export const knowledgeCommand: SlashCommand = {
         break;
       }
 
+      case 'map': {
+        const limit = readPositiveIntFlag(rest, '--limit', 50);
+        const query = positionalArgs(rest, ['--limit']).join(' ').trim();
+        const result = await knowledge.graph.map({
+          limit,
+          ...(query.length > 0 ? { query } : {}),
+        });
+        context.print(formatKnowledgeMap(result));
+        break;
+      }
+
       case 'lint': {
         const issues = await knowledge.status.lint();
         if (issues.length === 0) {
           context.print('[knowledge] No lint issues.');
           return;
         }
-        context.print(`[knowledge] ${issues.length} lint issue(s):`);
+        context.print(`[knowledge] ${issues.length} lint issue(s)`);
         for (const issue of issues) {
           context.print(`  ${issue.id} [${issue.severity}] ${issue.code}`);
           context.print(`    ${issue.message}`);
@@ -524,7 +545,7 @@ export const knowledgeCommand: SlashCommand = {
           context.print('Knowledge review queue is empty.');
           return;
         }
-        context.print(`[knowledge] Review queue (${issues.length}):`);
+        context.print(`[knowledge] Review queue (${issues.length})`);
         for (const issue of issues) {
           context.print(`  ${issue.id} [${issue.severity}] ${issue.code}`);
           context.print(`    ${issue.message}`);
@@ -558,11 +579,11 @@ export const knowledgeCommand: SlashCommand = {
           });
           context.print([
             `[knowledge] Reviewed issue ${result.issue.id}`,
-            `  action: ${action}`,
-            `  status: ${result.issue.status}`,
-            ...(result.node ? [`  node: ${result.node.id} ${result.node.title}`] : []),
-            ...(result.source ? [`  source: ${result.source.id} ${result.source.title ?? result.source.canonicalUri ?? result.source.sourceUri ?? 'untitled'}`] : []),
-            ...(result.appliedFacts ? [`  applied facts: ${Object.keys(result.appliedFacts).join(', ') || 'none'}`] : []),
+            `  action ${action}`,
+            `  status ${result.issue.status}`,
+            ...(result.node ? [`  node ${result.node.id} ${result.node.title}`] : []),
+            ...(result.source ? [`  knowledge source ${result.source.id} ${result.source.title ?? result.source.canonicalUri ?? result.source.sourceUri ?? 'untitled'}`] : []),
+            ...(result.appliedFacts ? [`  applied facts ${Object.keys(result.appliedFacts).join(', ') || 'none'}`] : []),
           ].join('\n'));
         } catch (error) {
           context.print(`[knowledge] ${error instanceof Error ? error.message : String(error)}`);
@@ -578,9 +599,9 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No consolidation candidates.');
           return;
         }
-        context.print(`[knowledge] Consolidation candidates (${candidates.length}):`);
+        context.print(`[knowledge] Consolidation candidates (${candidates.length})`);
         for (const candidate of candidates) {
-          context.print(`  ${candidate.id} [${candidate.status}] score=${candidate.score} ${candidate.title}`);
+          context.print(`  ${candidate.id} [${candidate.status}] score ${candidate.score} ${candidate.title}`);
           context.print(`    ${candidate.candidateType}`);
         }
         break;
@@ -595,7 +616,7 @@ export const knowledgeCommand: SlashCommand = {
           }
           const report = await knowledge.connectors.doctor(second);
           if (!report) {
-            context.print(`[knowledge] Connector doctor report unavailable: ${second}`);
+            context.print(`[knowledge] Connector doctor report unavailable ${second}`);
             return;
           }
           context.print([
@@ -610,14 +631,14 @@ export const knowledgeCommand: SlashCommand = {
         if (first) {
           const connector = knowledge.connectors.get(first);
           if (!connector) {
-            context.print(`[knowledge] Unknown connector: ${first}`);
+            context.print(`[knowledge] Unknown connector ${first}`);
             return;
           }
           context.print([
             `[knowledge] Connector ${connector.id}`,
-            `  name: ${connector.displayName ?? connector.id}`,
-            `  sourceType: ${connector.sourceType}`,
-            `  description: ${connector.description}`,
+            `  name ${connector.displayName ?? connector.id}`,
+            `  source type ${connector.sourceType}`,
+            `  description ${connector.description}`,
             `  capabilities: ${connector.capabilities?.join(', ') || 'none'}`,
           ].join('\n'));
           return;
@@ -627,7 +648,7 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No connectors.');
           return;
         }
-        context.print(`[knowledge] Connectors (${connectors.length}):`);
+        context.print(`[knowledge] Connectors (${connectors.length})`);
         for (const connector of connectors) {
           context.print(`  ${connector.id} [${connector.sourceType}] ${connector.displayName ?? connector.id}`);
           context.print(`    ${connector.description}`);
@@ -643,7 +664,7 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No consolidation reports.');
           return;
         }
-        context.print(`[knowledge] Consolidation reports (${reports.length}):`);
+        context.print(`[knowledge] Consolidation reports (${reports.length})`);
         for (const report of reports) {
           context.print(`  ${report.id} [${report.kind}] ${report.title}`);
           context.print(`    ${report.summary}`);
@@ -657,7 +678,7 @@ export const knowledgeCommand: SlashCommand = {
           context.print('[knowledge] No knowledge schedules.');
           return;
         }
-        context.print(`[knowledge] Managed schedules (${schedules.length}):`);
+        context.print(`[knowledge] Managed schedules (${schedules.length})`);
         for (const schedule of schedules) {
           context.print(`  ${schedule.id} [${schedule.enabled ? 'enabled' : 'disabled'}] ${schedule.jobId}`);
           context.print(`    ${schedule.label}`);
@@ -709,10 +730,10 @@ export const knowledgeCommand: SlashCommand = {
         const result = await knowledge.status.reindex();
         context.print([
           '[knowledge] Reindex complete',
-          `  sources: ${result.status.sourceCount}`,
-          `  nodes: ${result.status.nodeCount}`,
-          `  edges: ${result.status.edgeCount}`,
-          `  issues: ${result.status.issueCount}`,
+          `  sources ${result.status.sourceCount}`,
+          `  nodes ${result.status.nodeCount}`,
+          `  edges ${result.status.edgeCount}`,
+          `  issues ${result.status.issueCount}`,
         ].join('\n'));
         break;
       }
@@ -743,6 +764,7 @@ export const knowledgeCommand: SlashCommand = {
           '  list [--kind <sources|nodes|issues>] [--limit <n>]',
           '  search <query> [--limit <n>]',
           '  get <id>',
+          '  map [query] [--limit <n>]',
           '  queue [limit]',
           '  review-issue <issueId> <accept|reject|resolve|reopen|edit|forget> [--reviewer <name>] [--value <json-object>] --yes',
           '  candidates [limit]',

package/src/input/commands/local-provider-runtime.ts

@@ -13,6 +13,14 @@ function isValidProviderName(name: string): boolean {
   return /^[a-zA-Z0-9_-]+$/.test(name);
 }
 
+function readDiscoveredModelIds(body: unknown): string[] {
+  if (!body || typeof body !== 'object' || !('data' in body) || !Array.isArray(body.data)) return [];
+  return body.data
+    .filter((model): model is { readonly id: unknown } => Boolean(model) && typeof model === 'object' && 'id' in model)
+    .map((model) => String(model.id))
+    .filter(Boolean);
+}
+
 export function registerLocalProviderRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
     name: 'provider',
@@ -36,20 +44,26 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
           return;
         }
         if (!isValidProviderName(name)) {
-          ctx.print('Error: Provider name must contain only letters, numbers, hyphens, and underscores.');
+          ctx.print([
+            'Error',
+            '  message Provider name must contain only letters, numbers, hyphens, and underscores.',
+          ].join('\n'));
           return;
         }
         let parsedUrl: URL;
         try {
           parsedUrl = new URL(baseURL);
         } catch {
-          ctx.print(`Error: '${baseURL}' is not a valid URL. Example: http://192.168.0.85:8001/v1`);
+          ctx.print([
+            'Error',
+            `  message ${baseURL} is not a valid URL. Example http://192.168.0.85:8001/v1`,
+          ].join('\n'));
           return;
         }
         const providersDir = shellPaths.resolveUserPath(GOODVIBES_AGENT_SURFACE_ROOT, 'providers');
         const providerFile = join(providersDir, `${name}.json`);
         if (existsSync(providerFile)) {
-          ctx.print(`Error: Provider '${name}' already exists at ${providerFile}\nRemove it first with: /provider remove ${name} --yes`);
+          ctx.print(`Provider ${name} already exists at ${providerFile}\nRemove it first with /provider remove ${name} --yes`);
           return;
         }
 
@@ -64,12 +78,7 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
           clearTimeout(timeoutId);
           if (res.ok) {
             const body = await res.json() as unknown;
-            if (body && typeof body === 'object' && 'data' in body && Array.isArray((body as Record<string, unknown>).data)) {
-              discoveredModelIds = ((body as { data: unknown[] }).data)
-                .filter((m): m is Record<string, unknown> => typeof m === 'object' && m !== null && 'id' in m)
-                .map((m) => String(m.id))
-                .filter(Boolean);
-            }
+            discoveredModelIds = readDiscoveredModelIds(body);
           }
         } catch {
           ctx.print(`Could not reach ${baseURL}/models — creating provider with a minimal starter config.`);
@@ -91,13 +100,13 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
               id: defaultModel,
               displayName: defaultModel,
               contextWindow: 8192,
-              capabilities: { toolCalling: true, codeEditing: true, reasoning: false, multimodal: false },
+              capabilities: { toolCalling: true, codeEditing: false, reasoning: false, multimodal: false },
             }]
           : discoveredModelIds.map((id) => ({
               id,
               displayName: id,
               contextWindow: contextWindows[id] ?? 8192,
-              capabilities: { toolCalling: true, codeEditing: true, reasoning: false, multimodal: false },
+              capabilities: { toolCalling: true, codeEditing: false, reasoning: false, multimodal: false },
             }));
         const config: CustomProviderConfig = {
           name,
@@ -111,10 +120,10 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
           mkdirSync(providersDir, { recursive: true });
           await writeFile(providerFile, JSON.stringify(config, null, 2), 'utf-8');
         } catch (e) {
-          ctx.print(`Error writing provider file: ${summarizeError(e)}`);
+          ctx.print(`Error writing provider file ${summarizeError(e)}`);
           return;
         }
-        ctx.print(`Provider '${name}' added with ${models.length} model(s):\n${discoveredModelIds.length > 0 ? discoveredModelIds.map((id) => `  • ${id} (${(contextWindows[id] ?? 8192).toLocaleString()} ctx)`).join('\n') : `  • ${defaultModel} (starter entry)`}\nThe file watcher will auto-register it shortly.`);
+        ctx.print(`Provider ${name} added with ${models.length} model(s)\n${discoveredModelIds.length > 0 ? discoveredModelIds.map((id) => `  • ${id} (${(contextWindows[id] ?? 8192).toLocaleString()} ctx)`).join('\n') : `  • ${defaultModel} (starter entry)`}\nThe file watcher will auto-register it shortly.`);
         return;
       }
 
@@ -129,19 +138,22 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
           return;
         }
         if (!isValidProviderName(name)) {
-          ctx.print('Error: Provider name must contain only letters, numbers, hyphens, and underscores.');
+          ctx.print([
+            'Error',
+            '  message Provider name must contain only letters, numbers, hyphens, and underscores.',
+          ].join('\n'));
           return;
         }
         const providerFile = shellPaths.resolveUserPath(GOODVIBES_AGENT_SURFACE_ROOT, 'providers', `${name}.json`);
         if (!existsSync(providerFile)) {
-          ctx.print(`Error: No custom provider '${name}' found at ${providerFile}`);
+          ctx.print(`No custom provider ${name} found at ${providerFile}`);
           return;
         }
         try {
           await unlink(providerFile);
-          ctx.print(`Provider '${name}' removed. The file watcher will deregister it shortly.`);
+          ctx.print(`Provider ${name} removed. The file watcher will deregister it shortly.`);
         } catch (e) {
-          ctx.print(`Error removing provider file: ${summarizeError(e)}`);
+          ctx.print(`Error removing provider file ${summarizeError(e)}`);
         }
         return;
       }
@@ -152,11 +164,12 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
           return;
         }
         const providers = requireProviderApi(ctx).listProviderIds();
-        ctx.print(['Available providers:', ...providers.map((provider) => `  ${provider === ctx.session.runtime.provider ? '▶' : ' '} ${provider}`)].join('\n'));
+        ctx.print(['Available providers', ...providers.map((provider) => `  ${provider === ctx.session.runtime.provider ? '▶' : ' '} ${provider}`)].join('\n'));
         return;
       }
 
       const providerName = commandArgs[0];
+      const requestedModel = commandArgs[1];
       const providerApi = requireProviderApi(ctx);
       const selectable = await providerApi.listModels({
         providerId: providerName,
@@ -164,17 +177,26 @@ export function registerLocalProviderRuntimeCommands(registry: CommandRegistry):
       });
       const match = selectable[0];
       if (!match) {
-        ctx.print(`Unknown provider: ${providerName}. Available: ${providerApi.listProviderIds().join(', ')}`);
+        ctx.print([
+          `Unknown provider ${providerName}`,
+          `available providers ${providerApi.listProviderIds().join(', ')}`,
+        ].join('\n'));
         return;
       }
       try {
-        const selected = await providerApi.selectModel(match.registryKey);
+        const registryKey = requestedModel
+          ? requestedModel.includes(':') ? requestedModel : `${providerName}:${requestedModel}`
+          : match.registryKey;
+        const selected = await providerApi.selectModel(registryKey);
         ctx.session.runtime.model = selected.registryKey;
         ctx.session.runtime.provider = selected.providerId;
         ctx.platform.configManager.set('provider.model', selected.registryKey);
         ctx.print(`Switched to provider: ${selected.providerId} (model: ${selected.modelId})`);
       } catch (e) {
-        ctx.print(`Error: ${summarizeError(e)}`);
+        ctx.print([
+          'Error',
+          `  message ${summarizeError(e)}`,
+        ].join('\n'));
       }
     },
   });