@vybestack/llxprt-code-tools 0.10.0 → 0.11.0-nightly.260728.ffaa8d5d7

package/src/tools/shell.ts

@@ -23,6 +23,7 @@ import {
   type ToolCallConfirmationDetails,
   type ToolExecuteConfirmationDetails,
   type PolicyUpdateOptions,
+  type LiveOutputUpdate,
 } from './tools.js';
 import { ToolErrorType } from '../types/tool-error.js';
 import { stringOrDefault } from '../utils/stringCoalescing.js';
@@ -184,7 +185,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
   async execute(
     signal: AbortSignal,
-    updateOutput?: (output: string) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     this.validateFilterParams();
 
@@ -243,7 +244,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     timeoutSeconds: number | undefined,
     defaultTimeoutSeconds: number,
     _timeoutId: ReturnType<typeof setTimeout> | null,
-    updateOutput?: (output: string) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     const combinedSignal = timeoutController.signal;
     const cwd = this.resolveCwd();
@@ -340,7 +341,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
   }
 
   private createOutputEventHandler(
-    updateOutput: ((output: string) => void) | undefined,
+    updateOutput: ((update: LiveOutputUpdate) => void) | undefined,
   ): (event: ShellOutputEvent) => void {
     let cumulativeOutput = '';
     let lastUpdateTime = 0;
@@ -353,8 +354,20 @@ export class ShellToolInvocation extends BaseToolInvocation<
       switch (event.type) {
         case 'data': {
           if (isBinaryStream) break;
-          cumulativeOutput = event.chunk ?? '';
-          shouldUpdate = true;
+          const chunk = event.chunk;
+          if (typeof chunk === 'string') {
+            cumulativeOutput = chunk;
+            shouldUpdate = true;
+          } else if (chunk !== undefined) {
+            // PTY terminal-buffer snapshot — replace semantics.
+            updateOutput({ mode: 'replace', data: chunk });
+            lastUpdateTime = Date.now();
+          } else {
+            // Preserve pre-migration behavior: an undefined chunk on a data
+            // event forwards the (empty) cumulative output as an append.
+            cumulativeOutput = '';
+            shouldUpdate = true;
+          }
           break;
         }
         case 'binary_detected':
@@ -375,7 +388,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
       }
 
       if (shouldUpdate) {
-        updateOutput(cumulativeOutput);
+        updateOutput({ mode: 'append', data: cumulativeOutput });
         lastUpdateTime = Date.now();
       }
     };

package/src/tools/todo-pause.ts

@@ -5,7 +5,12 @@
  */
 
 import { Type } from '../types/schema-type.js';
-import { BaseTool, type ToolResult, Kind } from './tools.js';
+import {
+  BaseTool,
+  type ToolResult,
+  Kind,
+  type LiveOutputUpdate,
+} from './tools.js';
 import type { ITodoService } from '../interfaces/ITodoService.js';
 import type { IToolHost } from '../interfaces/IToolHost.js';
 import { EmojiFilter, isEmojiFilterMode } from '../utils/EmojiFilter.js';
@@ -118,7 +123,7 @@ export class TodoPause extends BaseTool<TodoPauseParams, ToolResult> {
   async execute(
     params: TodoPauseParams,
     _signal: AbortSignal,
-    _updateOutput?: (output: string) => void,
+    _updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     const reasonResult = this.filterReason(params.reason);
     if (reasonResult.blocked) {

package/src/tools/todo-read.ts

@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseTool, type ToolResult, Kind } from './tools.js';
+import {
+  BaseTool,
+  type ToolResult,
+  Kind,
+  type LiveOutputUpdate,
+} from './tools.js';
 import { type Todo } from '../types/todo-schemas.js';
 import { Type } from '../types/schema-type.js';
 import { TodoReminderService } from '../utils/todoReminderService.js';
@@ -39,7 +44,7 @@ export class TodoRead extends BaseTool<TodoReadParams, ToolResult> {
   async execute(
     _params: TodoReadParams,
     _signal: AbortSignal,
-    _updateOutput?: (output: string) => void,
+    _updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     // Get session and agent IDs from context
     const sessionId = this.context?.sessionId ?? 'default';

package/src/tools/todo-write.ts

@@ -5,7 +5,12 @@
  */
 
 import { Type } from '../types/schema-type.js';
-import { BaseTool, type ToolResult, Kind } from './tools.js';
+import {
+  BaseTool,
+  type ToolResult,
+  Kind,
+  type LiveOutputUpdate,
+} from './tools.js';
 import { type Todo, TodoArraySchema } from '../types/todo-schemas.js';
 import { DEFAULT_AGENT_ID } from './todo-store.js';
 import { TodoReminderService } from '../utils/todoReminderService.js';
@@ -147,7 +152,7 @@ export class TodoWrite extends BaseTool<TodoWriteParams, ToolResult> {
   async execute(
     params: TodoWriteParams,
     _signal: AbortSignal,
-    _updateOutput?: (output: string) => void,
+    _updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     const normalizedTodos = this.normalizeTodos(params.todos);
     const validation = this.validateAndFilterTodos(normalizedTodos);

package/src/tools/tool-registry.ts

@@ -11,6 +11,7 @@ import {
   type ToolResult,
   BaseTool,
   BaseToolInvocation,
+  type LiveOutputUpdate,
 } from './tools.js';
 import { type ToolContext, isContextAwareTool } from '../types/tool-context.js';
 import type { IToolRegistryHost } from '../interfaces/IToolRegistryHost.js';
@@ -22,6 +23,11 @@ import { ToolErrorType } from '../types/tool-error.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import { normalizeToolName } from '../formatters/toolNameUtils.js';
+import {
+  buildToolGovernance,
+  isToolBlocked,
+  type ToolGovernance,
+} from '../formatters/toolGovernanceUtils.js';
 
 export const DISCOVERED_TOOL_PREFIX = 'discovered_tool_';
 
@@ -115,7 +121,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
   async execute(
     params: ToolParams,
     signal: AbortSignal,
-    _updateOutput?: (output: string) => void,
+    _updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     const callCommand = this.config.getToolCallCommand?.() ?? '';
     const child = spawn(callCommand, [this.name]);
@@ -262,7 +268,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
 
   async execute(
     signal: AbortSignal,
-    updateOutput?: (output: string) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<ToolResult> {
     return this.tool.execute(this.params, signal, updateOutput);
   }
@@ -287,70 +293,16 @@ export class ToolRegistry {
     this.messageBus = messageBus;
   }
 
-  private getToolGovernance(): {
-    allowed: Set<string>;
-    disabled: Set<string>;
-    excluded: Set<string>;
-  } {
-    const rawEphemerals =
-      typeof this.config.getEphemeralSettings === 'function'
-        ? (this.config.getEphemeralSettings() as
-            | Record<string, unknown>
-            | null
-            | undefined
-            | false
-            | 0
-            | '')
-        : undefined;
-
-    const ephemerals: Record<string, unknown> =
-      resolveEphemerals(rawEphemerals);
-
-    const allowedRaw = Array.isArray(ephemerals['tools.allowed'])
-      ? (ephemerals['tools.allowed'] as string[])
-      : [];
-
-    function resolveDisabled(ephemeralsMap: Record<string, unknown>): string[] {
-      if (Array.isArray(ephemeralsMap['tools.disabled'])) {
-        return ephemeralsMap['tools.disabled'] as string[];
-      }
-      if (Array.isArray(ephemeralsMap['disabled-tools'])) {
-        return ephemeralsMap['disabled-tools'] as string[];
-      }
-      return [];
-    }
-
-    const disabledRaw = resolveDisabled(ephemerals);
-    const excludedRaw = this.config.getExcludeTools?.() ?? [];
-
-    return {
-      allowed: new Set(
-        allowedRaw.map((name) => normalizeToolName(name) ?? name),
-      ),
-      disabled: new Set(
-        disabledRaw.map((name) => normalizeToolName(name) ?? name),
-      ),
-      excluded: new Set(
-        excludedRaw.map((name) => normalizeToolName(name) ?? name),
-      ),
-    };
+  private getToolGovernance(): ToolGovernance {
+    return buildToolGovernance({
+      getEphemeralSettings: () =>
+        this.config.getEphemeralSettings?.() ?? undefined,
+      getExcludeTools: () => this.config.getExcludeTools?.(),
+    });
   }
 
-  private isToolActive(
-    toolName: string,
-    governance: ReturnType<ToolRegistry['getToolGovernance']>,
-  ): boolean {
-    const canonical = normalizeToolName(toolName) ?? toolName;
-    if (governance.excluded.has(canonical)) {
-      return false;
-    }
-    if (governance.disabled.has(canonical)) {
-      return false;
-    }
-    if (governance.allowed.size > 0 && !governance.allowed.has(canonical)) {
-      return false;
-    }
-    return true;
+  private isToolActive(toolName: string, governance: ToolGovernance): boolean {
+    return !isToolBlocked(toolName, governance);
   }
 
   /**
@@ -818,21 +770,3 @@ export class ToolRegistry {
     }
   }
 }
-
-type EphemeralValue =
-  | Record<string, unknown>
-  | null
-  | undefined
-  | false
-  | 0
-  | '';
-
-function resolveEphemerals(raw: EphemeralValue): Record<string, unknown> {
-  if (raw === null || raw === undefined || raw === false || raw === 0) {
-    return {};
-  }
-  if (raw === '') {
-    return {};
-  }
-  return raw;
-}

package/src/tools/tools.ts

@@ -18,7 +18,10 @@ import {
 } from '../interfaces/IToolMessageBus.js';
 import type { DiffUpdateResult } from '../interfaces/IIdeService.js';
 import { SchemaValidator } from '../utils/schemaValidator.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import type {
+  AnsiOutput,
+  LiveOutputUpdate,
+} from '../utils/terminalSerializer.js';
 import type { ContextAwareTool, ToolContext } from '../types/tool-context.js';
 import {
   ToolConfirmationOutcome,
@@ -28,6 +31,7 @@ import { ToolErrorType } from '../types/tool-error.js';
 
 export { ToolConfirmationOutcome } from '../types/tool-confirmation-types.js';
 export type { ToolConfirmationPayload } from '../types/tool-confirmation-types.js';
+export type { LiveOutputUpdate } from '../utils/terminalSerializer.js';
 
 /**
  * Represents a validated and ready-to-execute tool call.
@@ -74,7 +78,7 @@ export interface ToolInvocation<
    */
   execute(
     signal: AbortSignal,
-    updateOutput?: (output: string | AnsiOutput) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
     terminalColumns?: number,
     terminalRows?: number,
     setPidCallback?: (pid: number) => void,
@@ -419,7 +423,7 @@ export abstract class BaseToolInvocation<
 
   abstract execute(
     signal: AbortSignal,
-    updateOutput?: (output: string | AnsiOutput) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
     terminalColumns?: number,
     terminalRows?: number,
     setPidCallback?: (pid: number) => void,
@@ -577,7 +581,7 @@ export abstract class DeclarativeTool<
   async buildAndExecute(
     params: TParams,
     signal: AbortSignal,
-    updateOutput?: (output: string | AnsiOutput) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<TResult> {
     const invocation = this.build(params);
     return invocation.execute(signal, updateOutput);
@@ -1002,7 +1006,7 @@ export abstract class BaseTool<
   abstract execute(
     params: TParams,
     signal: AbortSignal,
-    updateOutput?: (output: string) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
   ): Promise<TResult>;
 
   /**
@@ -1043,7 +1047,7 @@ class BaseToolLegacyInvocation<
 
   async execute(
     signal: AbortSignal,
-    updateOutput?: (output: string) => void,
+    updateOutput?: (update: LiveOutputUpdate) => void,
     _terminalColumns?: number,
     _terminalRows?: number,
     _setPidCallback?: (pid: number) => void,

package/src/utils/fileUtils.ts

@@ -222,8 +222,18 @@ export async function detectFileType(
     return 'svg';
   }
 
+  // mime-db maps the FreeHand family (.fh, .fh4, .fh5, .fh7, .fhc) to
+  // image/x-freehand, but these extensions are commonly shader/source text.
+  // Exclude them from the image short-circuit below so they fall through to
+  // content-based detection (text or binary).
+  const freehandExtensions = ['.fh', '.fh4', '.fh5', '.fh7', '.fhc'];
+
   const lookedUpMimeType = mime.lookup(filePath);
-  if (typeof lookedUpMimeType === 'string' && lookedUpMimeType !== '') {
+  if (
+    typeof lookedUpMimeType === 'string' &&
+    lookedUpMimeType !== '' &&
+    !freehandExtensions.includes(ext)
+  ) {
     if (lookedUpMimeType.startsWith('image/')) return 'image';
     if (lookedUpMimeType.startsWith('audio/')) return 'audio';
     if (lookedUpMimeType.startsWith('video/')) return 'video';

package/src/utils/terminalSerializer.ts

@@ -35,3 +35,12 @@ export interface AnsiToken {
 
 export type AnsiLine = AnsiToken[];
 export type AnsiOutput = AnsiLine[];
+
+/**
+ * Explicit tagged update protocol for live-output streaming. Discriminated
+ * by `mode`: text stream producers emit `append` (incremental deltas);
+ * terminal-buffer producers emit `replace` (full snapshots).
+ */
+export type LiveOutputUpdate =
+  | { mode: 'append'; data: string }
+  | { mode: 'replace'; data: AnsiOutput };