@pellux/goodvibes-agent 0.1.116 → 1.0.0

package/src/input/file-picker.ts

@@ -1,3 +1,4 @@
+import type { Dirent } from 'node:fs';
 import { readdir } from 'node:fs/promises';
 import { join, relative } from 'node:path';
 import type { ShellPathService } from '@/runtime/index.ts';
@@ -160,9 +161,9 @@ export class FilePickerModal {
     if (depth > 8) return; // Limit depth
     if (files.length > 5000) return; // Limit total files
 
-    let entries: import('node:fs').Dirent[];
+    let entries: Dirent[];
     try {
-      entries = (await readdir(dir, { withFileTypes: true })) as unknown as import('node:fs').Dirent[];
+      entries = await readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }

package/src/input/handler-command-route.ts

@@ -106,7 +106,7 @@ export function handleCommandModeToken(state: CommandModeRouteState, token: Inpu
           if (skillContent) {
             state.commandContext?.submitInput?.(skillContent);
           } else {
-            state.conversationManager?.log(`Unknown command: /${name}. Type /help for available commands.`, { fg: '#ef4444' });
+            state.conversationManager?.log(`Unknown command /${name}. Type /help for available commands.`, { fg: '#ef4444' });
             state.requestRender();
           }
         }
@@ -121,27 +121,24 @@ export function handleCommandModeToken(state: CommandModeRouteState, token: Inpu
 }
 
 function withPanelFocusSync(context: CommandContext, state: CommandModeRouteState): CommandContext {
-  const panelIsFocusable = (): boolean =>
-    state.panelManager.isVisible() && state.panelManager.getAllOpen().length > 0;
-
   return {
     ...context,
     openPanelPicker: context.openPanelPicker
       ? () => {
           context.openPanelPicker?.();
-          state.panelFocused = panelIsFocusable();
+          state.panelFocused = false;
         }
       : undefined,
     showPanel: context.showPanel
       ? (panelId, pane) => {
           context.showPanel?.(panelId, pane);
-          state.panelFocused = true;
+          state.panelFocused = false;
         }
       : undefined,
     focusPanels: context.focusPanels
       ? () => {
           context.focusPanels?.();
-          state.panelFocused = panelIsFocusable();
+          state.panelFocused = false;
         }
       : undefined,
     focusPrompt: context.focusPrompt

package/src/input/handler-content-actions.ts

@@ -1,10 +1,9 @@
-import { readFileSync, existsSync } from 'node:fs';
+import { existsSync, lstatSync, readFileSync, readdirSync } from 'node:fs';
+import { basename, relative } from 'node:path';
 import { copyToClipboard, pasteFromClipboard, pasteImageFromClipboard } from '../utils/clipboard.ts';
 import type { InfiniteBuffer } from '../core/history.ts';
 import type { ConversationManager } from '../core/conversation';
-import type { PermissionCategory } from '@pellux/goodvibes-sdk/platform/permissions';
 import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
-import type { CommandContext } from './command-registry.ts';
 import type { BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks';
 import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
@@ -32,6 +31,11 @@ export const BINARY_IMAGE_MAGIC: {
 ];
 
 export const IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.webp', '.gif'];
+const MAX_CONTEXT_FILE_BYTES = 64 * 1024;
+const MAX_CONTEXT_DIRECTORY_ENTRIES = 200;
+const URL_REFERENCE_REGEX = /^https?:\/\/[^\s]+$/i;
+const CONTEXT_REFERENCE_REGEX = /(^|\s)@([^\s]+)/g;
+const CONTEXT_REFERENCE_TRAILING_PUNCTUATION = /[),.;:!?]+$/;
 
 export function formatFileSize(bytes: number): string {
   if (bytes < 1024) return `${bytes}B`;
@@ -48,6 +52,86 @@ export function mediaTypeFromExt(ext: string): string {
   }
 }
 
+function stripTrailingReferencePunctuation(value: string): { readonly core: string; readonly suffix: string } {
+  const match = CONTEXT_REFERENCE_TRAILING_PUNCTUATION.exec(value);
+  if (!match) return { core: value, suffix: '' };
+  return {
+    core: value.slice(0, -match[0].length),
+    suffix: match[0],
+  };
+}
+
+function escapeContextAttribute(value: string): string {
+  return value
+    .replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+}
+
+function readContextFileBlock(reference: string, projectRoot: string): string | null {
+  let resolvedPath: string;
+  try {
+    resolvedPath = resolveAndValidatePath(reference, projectRoot);
+  } catch (error) {
+    logger.debug('expandPrompt: context reference rejected', { reference, error: summarizeError(error) });
+    return null;
+  }
+  if (!existsSync(resolvedPath)) return null;
+
+  const stat = lstatSync(resolvedPath);
+  const label = escapeContextAttribute(relative(projectRoot, resolvedPath) || basename(resolvedPath));
+  if (stat.isDirectory()) {
+    const entries = readdirSync(resolvedPath, { withFileTypes: true })
+      .slice(0, MAX_CONTEXT_DIRECTORY_ENTRIES)
+      .map((entry) => `${entry.isDirectory() ? 'dir ' : 'file'} ${entry.name}`)
+      .join('\n');
+    return [
+      `<context-folder path="${label}">`,
+      entries || '(empty directory)',
+      stat.isDirectory() ? `</context-folder>` : '',
+    ].filter(Boolean).join('\n');
+  }
+
+  if (!stat.isFile()) return null;
+  if (stat.size > MAX_CONTEXT_FILE_BYTES) {
+    return [
+      `<context-file path="${label}" truncated="true" bytes="${stat.size}">`,
+      readFileSync(resolvedPath, 'utf-8').slice(0, MAX_CONTEXT_FILE_BYTES),
+      '</context-file>',
+    ].join('\n');
+  }
+
+  return [
+    `<context-file path="${label}" bytes="${stat.size}">`,
+    readFileSync(resolvedPath, 'utf-8'),
+    '</context-file>',
+  ].join('\n');
+}
+
+function buildContextUrlBlock(reference: string): string {
+  const href = escapeContextAttribute(reference);
+  return [
+    `<context-url href="${href}">`,
+    'The user referenced this URL in the prompt. Use connected tools only if content retrieval is needed; do not ingest it into Agent Knowledge unless the user explicitly asks.',
+    '</context-url>',
+  ].join('\n');
+}
+
+function expandContextReferences(text: string, projectRoot: string): string {
+  return text.replace(CONTEXT_REFERENCE_REGEX, (full: string, prefix: string, rawReference: string): string => {
+    if (rawReference.startsWith('model:')) return full;
+    const { core, suffix } = stripTrailingReferencePunctuation(rawReference);
+    if (!core || core.startsWith('@')) return full;
+    if (URL_REFERENCE_REGEX.test(core)) {
+      return `${prefix}${buildContextUrlBlock(core)}${suffix}`;
+    }
+    const fileBlock = readContextFileBlock(core, projectRoot);
+    if (!fileBlock) return full;
+    return `${prefix}${fileBlock}${suffix}`;
+  });
+}
+
 export type PasteRegistryState = {
   pasteRegistry: Map<string, string>;
   nextPasteId: number;
@@ -173,6 +257,8 @@ export function expandPrompt(
     }
   }
 
+  expanded = expandContextReferences(expanded, projectRoot);
+
   const imageMarkerRegex = /\[IMAGE: (img\d+), [^\]]+\]/g;
   const imageMarkers: { marker: string; index: number; id: string }[] = [];
   let imgMatch;
@@ -337,29 +423,6 @@ export function handleBlockToggle(
   }
 }
 
-export function handleDiffApply(
-  conversationManager: ConversationManager | null,
-  getScrollTop: () => number,
-  commandContext: CommandContext | undefined,
-  requestRender: () => void,
-  getCallId: () => string,
-  category: PermissionCategory,
-): boolean {
-  void commandContext;
-  void getCallId;
-  void category;
-  if (!conversationManager) return false;
-  const lineIndex = getScrollTop();
-  const diff = conversationManager.getDiffAtLine(lineIndex);
-  if (!diff || !diff.filePath) return false;
-  conversationManager.log(
-    `[Diff apply blocked in GoodVibes Agent: ${diff.filePath}. Delegate build/fix work to GoodVibes TUI with /delegate <task>.]`,
-    { fg: '#f59e0b' },
-  );
-  requestRender();
-  return true;
-}
-
 export function handleCtrlC(
   prompt: string,
   saveUndoState: () => void,

package/src/input/handler-feed-routes.ts

@@ -25,7 +25,8 @@ export type PanelFocusRouteState = {
   autocompleteActive: boolean;
   requestRender: () => void;
   handlePathCompletion: () => boolean;
-  cyclePanelTab: (direction: 'next' | 'prev') => void;
+  cycleAgentWorkspaceCategory: (direction: 'next' | 'prev') => void;
+  dismissAgentWorkspace: () => boolean;
   onPanelInputConsumed?: (activePanel: import('../panels/types.ts').Panel | null, key: string) => void;
 };
 
@@ -42,16 +43,16 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
     !state.searchActive &&
     !state.autocompleteActive
   ) {
-    const pm = state.panelManager;
-    if (pm.isVisible() && pm.getAllOpen().length > 0) {
-      if (panelFocused) {
-        panelFocused = false;
-      } else if (!state.handlePathCompletion()) {
-        panelFocused = true;
-      }
+    if (panelFocused) {
+      panelFocused = false;
+      state.requestRender();
+      return { handled: true, panelFocused };
+    }
+    if (state.handlePathCompletion()) {
       state.requestRender();
       return { handled: true, panelFocused };
     }
+    return { handled: false, panelFocused };
   }
 
   if (!panelFocused) {
@@ -76,14 +77,17 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
     }
     const kb = state.keybindingsManager;
     if (kb.matches('panel-tab-next', token)) {
-      state.cyclePanelTab('next');
-      return { handled: true, panelFocused };
+      state.cycleAgentWorkspaceCategory('next');
+      return { handled: true, panelFocused: false };
     }
     if (kb.matches('panel-tab-prev', token)) {
-      state.cyclePanelTab('prev');
-      return { handled: true, panelFocused };
+      state.cycleAgentWorkspaceCategory('prev');
+      return { handled: true, panelFocused: false };
     }
     if (kb.matches('panel-close-all', token)) {
+      if (state.dismissAgentWorkspace()) {
+        return { handled: true, panelFocused: false };
+      }
       const pm = state.panelManager;
       for (const p of pm.getAllOpen()) pm.close(p.id);
       panelFocused = false;
@@ -91,6 +95,9 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
       return { handled: true, panelFocused };
     }
     if (kb.matches('panel-close', token)) {
+      if (state.dismissAgentWorkspace()) {
+        return { handled: true, panelFocused: false };
+      }
       const pm = state.panelManager;
       const active = pm.getActivePanel();
       if (active) {

package/src/input/handler-feed.ts

@@ -141,7 +141,6 @@ export interface InputFeedContext {
   readonly handleBlockCopy: () => void;
   readonly handleBookmark: () => void;
   readonly handleBlockSave: () => void;
-  readonly handleDiffApply: () => boolean;
   readonly handleUndo: () => void;
   readonly handleRedo: () => void;
   readonly handlePaste: () => void;
@@ -149,7 +148,8 @@ export interface InputFeedContext {
   readonly ensureInputCursorVisible: (contentWidth?: number) => void;
   readonly registerPaste: (content: string) => string;
   readonly executeBlockAction: (id: string) => void;
-  readonly cyclePanelTab: (direction: 'next' | 'prev') => void;
+  readonly cycleAgentWorkspaceCategory: (direction: 'next' | 'prev') => void;
+  readonly dismissAgentWorkspace: () => boolean;
   readonly onPanelInputConsumed: (activePanel: Panel | null, key: string) => void;
   readonly getWrappedPromptInfo: (contentWidth: number) => WrappedPromptInfo;
   readonly moveCursorVertical: (direction: -1 | 1) => boolean;
@@ -272,12 +272,12 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         handleBlockCopy: context.handleBlockCopy,
         handleBookmark: context.handleBookmark,
         handleBlockSave: context.handleBlockSave,
-        handleDiffApply: context.handleDiffApply,
         handleUndo: context.handleUndo,
         handleRedo: context.handleRedo,
         handlePaste: context.handlePaste,
         handleEscape: context.handleEscape,
-        cyclePanelTab: context.cyclePanelTab,
+        cycleAgentWorkspaceCategory: context.cycleAgentWorkspaceCategory,
+        dismissAgentWorkspace: context.dismissAgentWorkspace,
         panelManager: context.panelManager,
         keybindingsManager: context.keybindingsManager,
       };
@@ -297,7 +297,8 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       autocompleteActive: !!context.autocomplete?.isActive,
       requestRender: context.requestRender,
       handlePathCompletion: context.handlePathCompletion,
-      cyclePanelTab: context.cyclePanelTab,
+      cycleAgentWorkspaceCategory: context.cycleAgentWorkspaceCategory,
+      dismissAgentWorkspace: context.dismissAgentWorkspace,
       panelManager: context.panelManager,
       keybindingsManager: context.keybindingsManager,
       onPanelInputConsumed: context.onPanelInputConsumed,

package/src/input/handler-interactions.ts

@@ -1,7 +1,7 @@
-import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
+import { buildProviderAccountSnapshot } from '../panels/provider-account-snapshot.ts';
 import type { OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
-import { collectOnboardingSnapshot, readOnboardingCheckMarker, writeOnboardingCheckMarker } from '../runtime/onboarding/index.ts';
-import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, handleDiffApply, registerPaste } from './handler-content-actions.ts';
+import { collectOnboardingSnapshot } from '../runtime/onboarding/index.ts';
+import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, registerPaste } from './handler-content-actions.ts';
 import { clearModalStack, handleEscape, modalOpened } from './handler-modal-stack.ts';
 import { openOnboardingWizardState, type OpenOnboardingWizardOptions } from './handler-ui-state.ts';
 import type { InputHandler } from './handler.ts';
@@ -11,19 +11,6 @@ export function openOnboardingWizardForHandler(
     modeOrOptions: OnboardingWizardMode | OpenOnboardingWizardOptions = 'new',
   ): void {
     const options = typeof modeOrOptions === 'string' ? { mode: modeOrOptions } : modeOrOptions;
-    const userMarker = readOnboardingCheckMarker(handler.uiServices.environment.shellPaths, 'user');
-    if (!userMarker.payload) {
-      try {
-        writeOnboardingCheckMarker(handler.uiServices.environment.shellPaths, {
-          scope: 'user',
-          source: 'wizard',
-          mode: options.mode ?? 'new',
-        });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        handler.commandContext?.print?.(`Onboarding check marker could not be written: ${message}`);
-      }
-    }
     if (!handler.modalStack.includes('onboarding')) handler.modalOpened('onboarding');
     handler.clearOnboardingModelPickerCancelState();
     openOnboardingWizardState(handler.onboardingWizard, options);
@@ -50,10 +37,12 @@ export async function hydrateOnboardingWizardFromRuntimeForHandler(handler: Inpu
         },
         providerAccounts: {
           loadSnapshot: () => buildProviderAccountSnapshot({
-            providerRegistry: handler.uiServices.providers.providerRegistry,
-            serviceRegistry: handler.uiServices.platform.serviceRegistry,
-            subscriptionManager: handler.uiServices.platform.subscriptionManager,
-            secretsManager: handler.uiServices.platform.secretsManager,
+            providerModels: handler.uiServices.providers.providerRegistry,
+            services: handler.uiServices.platform.serviceRegistry,
+            subscriptions: handler.uiServices.platform.subscriptionManager,
+            environment: {
+              hasEnvironmentVariable: (name: string) => Boolean(process.env[name]),
+            },
           }),
         },
       });
@@ -152,7 +141,6 @@ export function executeBlockActionForHandler(handler: InputHandler, actionId: st
       case 'copy':     handler.handleBlockCopy(); break;
       case 'bookmark': handler.handleBookmark(); break;
       case 'toggle':   handler.handleBlockToggle(); break;
-      case 'apply':    handler.handleDiffApply(); break;
       case 'rerun':    handler.handleBlockRerun(); break;
     }
   }
@@ -172,21 +160,6 @@ export function handleBlockToggleForHandler(handler: InputHandler): void {
     handleBlockToggle(handler.conversationManager, handler.getScrollTop, handler.requestRender);
   }
 
-  /**
-   * handleDiffApply - Ctrl+A when a diff block is nearest: request approval and apply the diff.
-   * Returns true if a diff was found and applied (so caller can skip default Ctrl+A).
-   */
-export function handleDiffApplyForHandler(handler: InputHandler): boolean {
-    return handleDiffApply(
-      handler.conversationManager,
-      handler.getScrollTop,
-      handler.commandContext,
-      handler.requestRender,
-      () => `diff-apply-${Date.now()}`,
-      'write',
-    );
-  }
-
   /**
    * Handle Ctrl+C:
    * - If prompt has text: clear it

package/src/input/handler-modal-stack.ts

@@ -8,7 +8,7 @@ import type { SelectionResult } from './selection-modal.ts';
 
 export type ModalStackState = ActiveModalState & {
   modalStack: string[];
-  modalReturnFocus?: 'prompt' | 'panel' | 'indicator';
+  modalReturnFocus?: 'prompt' | 'indicator';
   panelFocused: boolean;
   indicatorFocused: boolean;
 };
@@ -20,7 +20,7 @@ export function modalOpened(state: ModalStackState, name: string): void {
   if (state.modalStack[state.modalStack.length - 1] === name) return;
   if (state.modalStack.includes(name)) return;
   if (state.modalStack.length === 0) {
-    state.modalReturnFocus = state.indicatorFocused ? 'indicator' : state.panelFocused ? 'panel' : 'prompt';
+    state.modalReturnFocus = state.indicatorFocused ? 'indicator' : 'prompt';
   }
   state.modalStack.push(name);
 }
@@ -86,7 +86,7 @@ export function handleEscape(state: EscapeState): {
       shortcutsOverlayActive,
       commandMode,
     }) !== null) return;
-    panelFocused = modalReturnFocus === 'panel';
+    panelFocused = false;
     indicatorFocused = modalReturnFocus === 'indicator';
     modalReturnFocus = 'prompt';
     state.modalReturnFocus = 'prompt';