@xingular/harness 2.0.0 → 2.1.0

package/src/terminal/tui/application.ts

@@ -184,6 +184,7 @@ export class TerminalApplication {
         session: () => this.session, runtime: () => this.runtime!, ui: this.ui,
         cwd: () => this.runtime!.cwd, sessionDirectory: () => this.runtime!.sessionDirectory,
         refresh: () => this.refresh(), shutdown: () => { void this.shutdown() }, setEditorText: text => { this.editor.setText(text); this.syncDraft(text) },
+        planMode: () => this.planMode, setPlanMode: enabled => this.setPlanMode(enabled),
         copyText: copyToClipboard, openExternal,
         changed: this.change,
         trajectory: {
@@ -307,8 +308,9 @@ export class TerminalApplication {
     this.phase = undefined
   }
   /** Plan mode narrows the session to read-only tools; leaving it restores the set the session had before. */
-  private togglePlanMode(): void {
+  private setPlanMode(enabled: boolean): void {
     if (!this.runtime) return
+    if (this.planMode === enabled) return
     if (this.planMode) {
       this.session.setActiveToolsByName(this.normalTools ?? this.session.getActiveToolNames())
       this.normalTools = undefined
@@ -316,8 +318,8 @@ export class TerminalApplication {
       this.normalTools = this.session.getActiveToolNames()
       this.session.setActiveToolsByName(planModeTools(this.normalTools))
     }
-    this.planMode = !this.planMode
-    this.notify(this.planMode ? 'Plan mode: only read-only tools are available. Shift+Tab returns to normal.' : 'Normal mode: all tools are available.')
+    this.planMode = enabled
+    this.notify(this.planMode ? 'Plan mode: only read-only tools are available. Use /plan off to return to normal.' : 'Normal mode: all tools are available.')
     this.change()
   }
   private scrollToLatest(): void { this.viewport?.scrollToEnd() }
@@ -446,7 +448,6 @@ export class TerminalApplication {
       else void this.shutdown()
     } else if (is('app.exit') && this.editor.getText() === '') void this.shutdown()
     else if (is('app.thinking.cycle')) this.session.cycleThinkingLevel()
-    else if (is('app.plan.toggle')) this.togglePlanMode()
     else if (is('app.thinking.increase') || is('app.thinking.decrease')) this.stepThinking(is('app.thinking.increase') ? 1 : -1)
     else if (is('app.thinking.save')) this.session.setThinkingLevel(this.session.thinkingLevel, { persist: true })
     else if (is('app.model.cycleForward') || is('app.model.cycleBackward')) this.attempt(() => this.session.cycleModel(is('app.model.cycleBackward') ? 'backward' : 'forward'))
@@ -513,7 +514,14 @@ export class TerminalApplication {
       const text = typeof message.content === 'string' ? message.content : message.content.filter(part => part.type === 'text').map(part => part.text).join('\n')
       if (text) this.editor.addToHistory?.(text)
     }
-    this.baseAutocomplete = skillCompletions(new CombinedAutocompleteProvider(this.commands.completions(), this.runtime.cwd), this.commands.skills)
+    const commands = this.commands.completions()
+    if (this.editor instanceof HarnessEditor) {
+      this.editor.setValidCommands([
+        ...commands.map(command => command.name),
+        ...this.commands.skills().map(skill => 'skill:' + skill.name)
+      ])
+    }
+    this.baseAutocomplete = skillCompletions(new CombinedAutocompleteProvider(commands, this.runtime.cwd), this.commands.skills)
     this.editor.setAutocompleteProvider?.(this.ui.wrapAutocomplete(this.baseAutocomplete))
     this.change()
   }

package/src/terminal/tui/commands.test.ts

@@ -31,6 +31,7 @@ function setup() {
     session: () => session, runtime: () => runtime as unknown as ReturnType<TerminalCommandHost['runtime']>, ui,
     cwd: () => '/isolated/project', sessionDirectory: () => '/isolated/account/history',
     refresh: vi.fn(), changed: vi.fn(), shutdown: vi.fn(), setEditorText: vi.fn(), copyText: vi.fn(async () => {}),
+    planMode: () => false, setPlanMode: vi.fn(),
     hotkeys: () => 'Escape: interrupt', changelog: async () => 'Harness release notes',
     trajectory: {
       list: vi.fn(async () => [trajectoryRun]),

package/src/terminal/tui/commands.ts

@@ -21,6 +21,8 @@ export interface TerminalCommandHost {
   sessionDirectory(): string
   refresh(): void
   changed(): void
+  planMode(): boolean
+  setPlanMode(enabled: boolean): void
   shutdown(): void
   setEditorText(text: string): void
   copyText(text: string): Promise<void>
@@ -39,6 +41,7 @@ export interface TerminalCommandCompletion { name: string; description?: string
 
 const BUILTINS: TerminalCommandCompletion[] = [
   { name: 'help', description: 'Available terminal commands' },
+  { name: 'plan', description: 'Toggle read-only plan mode' },
   { name: 'new', description: 'Start a new session' },
   { name: 'resume', description: 'Resume a session in this account and folder' },
   { name: 'tree', description: 'Navigate the session tree' },
@@ -286,6 +289,13 @@ export function createTerminalCommands(host: TerminalCommandHost) {
       const session = host.session()
       switch (name) {
         case 'help': notify(completions().map(item => `/${item.name}  ${item.description ?? ''}`).join('\n')); break
+        case 'plan': {
+          const current = host.planMode()
+          const next = !argument || argument === 'toggle' ? !current : argument === 'on' ? true : argument === 'off' ? false : null
+          if (next === null) throw new Error('Use /plan, /plan on, /plan off, or /plan toggle.')
+          host.setPlanMode(next)
+          break
+        }
         case 'quit': host.shutdown(); break
         case 'new': await host.runtime().newSession(); break
         case 'resume': {

package/src/terminal/tui/editor.ts

@@ -15,6 +15,12 @@ export const COMPOSER_SUGGESTIONS = [
   'write a test for the next change'
 ]
 
+function leadingSlashCommand(text: string, validCommands: ReadonlySet<string>): string | null {
+  const match = /^\s*\/([^\s/]+)(?=\s|$)/u.exec(text)
+  if (!match || !validCommands.has(match[1]!)) return null
+  return '/' + match[1]
+}
+
 export interface ComposerView {
   band(width: number, hiddenAbove: number, hiddenBelow: number): string
   theme(): Theme
@@ -27,11 +33,17 @@ export class HarnessEditor extends CustomEditor {
   private contentRows = 1
   private completionRows = 0
   private gutterWidth = 2
+  private validCommands = new Set<string>()
 
   constructor(tui: TUI, theme: EditorTheme, keybindings: KeybindingsManager, private readonly view: ComposerView) {
     super(tui, theme, keybindings, { paddingX: 0 })
   }
 
+  setValidCommands(commands: readonly string[]): void {
+    this.validCommands = new Set(commands)
+    this.tui.requestRender()
+  }
+
   override setPaddingX(_padding: number): void {
     super.setPaddingX(0)
   }
@@ -58,10 +70,13 @@ export class HarnessEditor extends CustomEditor {
     this.contentRows = content.length
     const theme = this.view.theme()
     const placeholder = this.getText() === '' ? this.view.placeholder() : undefined
+    const command = leadingSlashCommand(this.getText(), this.validCommands)
+    const commandLine = command ? content.findIndex(line => line.includes(command)) : -1
     const prompt = content.map((line, index) => {
       const cue = theme.fg('dim', index === 0 ? '❯ '.slice(0, this.gutterWidth) : ' '.repeat(this.gutterWidth))
       if (index === 0 && placeholder) return cue + this.placeholderRow(placeholder, innerWidth, theme)
-      return cue + line
+      const renderedLine = index === commandLine && command ? line.replace(command, theme.fg('mdLink', command)) : line
+      return cue + renderedLine
     })
     const completions = rows.slice(bottom + 1).map((line) => ' '.repeat(this.gutterWidth) + line)
     this.completionRows = completions.length

package/src/terminal/tui/keybindings.test.ts

@@ -4,11 +4,10 @@ import { join } from 'node:path'
 import { expect, it } from 'vitest'
 import { terminalKeybindings } from './keybindings'
 
-it('steps thinking effort on shift arrows and gives shift+tab to plan mode', () => {
+it('steps thinking effort on shift arrows', () => {
   const manager = terminalKeybindings('/unused/isolated-account')
   expect(manager.matches('\x1b[1;2A', 'app.thinking.increase')).toBe(true)
   expect(manager.matches('\x1b[1;2B', 'app.thinking.decrease')).toBe(true)
-  expect(manager.matches('\x1b[Z', 'app.plan.toggle')).toBe(true)
   expect(manager.matches('\x1b[Z', 'app.thinking.cycle')).toBe(false)
 })
 

package/src/terminal/tui/keybindings.ts

@@ -7,7 +7,6 @@ declare module '@earendil-works/pi-tui' {
   interface Keybindings {
     'app.thinking.increase': true
     'app.thinking.decrease': true
-    'app.plan.toggle': true
   }
 }
 
@@ -15,7 +14,7 @@ declare module '@earendil-works/pi-tui' {
 const actions: Record<string, string | string[]> = {
   'app.interrupt': 'escape', 'app.clear': 'ctrl+c', 'app.exit': 'ctrl+d',
   'app.suspend': process.platform === 'win32' ? [] : 'ctrl+z',
-  'app.thinking.cycle': [], 'app.thinking.save': 'ctrl+s', 'app.plan.toggle': 'shift+tab',
+  'app.thinking.cycle': [], 'app.thinking.save': 'ctrl+s',
   'app.thinking.increase': 'shift+up', 'app.thinking.decrease': 'shift+down',
   'app.model.cycleForward': 'ctrl+p', 'app.model.cycleBackward': 'alt+p',
   'app.model.select': 'ctrl+l', 'app.tools.expand': 'ctrl+o', 'app.thinking.toggle': 'ctrl+t',

package/src/terminal/tui/planMode.ts

@@ -1,12 +1,2 @@
-import { ASK_USER } from '../../tools/askUser'
-
-// Read-only inspection, questions and recall. Everything else is withdrawn in plan mode: file changes, commands,
-// memory writes, delegation and connected apps, since none of them can be judged read-only from their names.
-const READ_ONLY_TOOLS = new Set([
-  'read', 'grep', 'find', 'ls', ASK_USER, 'ask_user_question',
-  'history_search', 'history_read', 'wiki_entrypoint', 'wiki_search', 'wiki_read', 'wiki_list', 'memory_facts'
-])
-
-export function planModeTools(normal: readonly string[]): string[] {
-  return normal.filter(name => READ_ONLY_TOOLS.has(name))
-}
+// The terminal's plan mode uses the session's read-only tool set.
+export { planModeTools } from '../../sessions/planMode'

package/src/tools/types.ts

@@ -20,6 +20,8 @@ export interface ToolSpec {
   description: string
   /** Builds the TypeBox parameter schema. */
   parameters: (type: typeof import('typebox').Type) => unknown
+  /** Only reads or asks; such a tool stays callable in plan mode. */
+  readOnly?: boolean
   execute: (input: Record<string, unknown>) => Promise<string | ToolResult>
 }