fix(zsh): keep deferred line-init defined for plugins that call it by name (#26842)

* fix(zsh): keep deferred line-init defined for plugins that call it by name

Fixes #26029

Co-Authored-By: petersindex <petersindex@users.noreply.github.com>

* test(zsh): keep the named-call regression test out of the relay module

---------

Co-authored-by: m4air <m4air@Mac.localdomain>
Co-authored-by: petersindex <petersindex@users.noreply.github.com>

Author: 3 people

src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt

@@ -3,10 +3,12 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 import { prependOrcaCliDirToChildPath } from './cli/orca-cli-child-path'
+import { getDaemonZshWrapperSpec } from './daemon/daemon-zsh-shell-ready-wrapper-spec'
 import { POSIX_SHELL_STARTUP_COMMAND_ENV } from './pty/posix-shell-startup-command'
 import { getZshShellReadyWrapperFile } from './providers/local-pty-shell-ready-wrapper-generation'
 import { encodeShellStartupFeatures, selectShellStartupFeatures } from './shell-startup-features'
 import { ZSH_WRAPPER_DIR_MARKER_FILE } from './shell-templates'
+import { buildZshStartupHook } from './zsh-startup-wrapper-builder'
 import { hasZsh, MARKERS, runZshPty, ZSH_PATH } from './zsh-startup-hook-pty-harness'
 
 const itWithZsh = hasZsh ? it : it.skip
@@ -165,7 +167,6 @@ describe('zsh deferred startup after prompt-hook replacement', () => {
             ? ['source -- "$HOME/wrapper/.zshenv"', 'source -- "$HOME/wrapper/.zshenv"']
             : []),
           'O_LK=$(command -v orca-dev)',
-          'O_IR=${+functions[__orca_deferred_line_init]}',
           'O_SR=${+widgets[__orca_saved_line_init]}',
           ...(scheduleCleanup
             ? [
@@ -183,7 +184,6 @@ describe('zsh deferred startup after prompt-hook replacement', () => {
           'O_LK',
           'O_UC',
           'O_UN',
-          'O_IR',
           'O_SR',
           ...(scheduleCleanup ? ['O_SC', 'O_SE'] : []),
           ...(scheduledPrecmd ? ['O_EV', 'O_EO'] : []),
@@ -204,9 +204,6 @@ describe('zsh deferred startup after prompt-hook replacement', () => {
       if (!chainedLineInit) {
         expect(result.values.O_UN).toBe('zle-line-init')
       }
-      if (!chainedLineInit && !chainedRedraw && !repeatSource) {
-        expect(result.values.O_IR).toBe('0')
-      }
       expect(result.values.O_SR).toBe('0')
       if (repeatSource) {
         expect(result.output).not.toContain('job table full or recursion limit exceeded')
@@ -279,3 +276,72 @@ describe('zsh deferred startup after prompt-hook replacement', () => {
     }
   )
 })
+
+describe('zsh plugins that call deferred line-init by name', () => {
+  const roots: string[] = []
+
+  afterEach(() => {
+    for (const root of roots.splice(0)) {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  itWithZsh.each(['local', 'daemon'] as const)(
+    'keeps the plugin call working across prompts in a %s wrapper',
+    async (transport) => {
+      const home = mkdtempSync(join(tmpdir(), 'orca-zsh-named-wrapper-'))
+      roots.push(home)
+      const wrapperDir = join(home, 'wrapper')
+      mkdirSync(wrapperDir)
+      // Some input plugins copy the bound widget's function name into their own body.
+      writeFileSync(
+        join(home, '.zshrc'),
+        `functions[orca_test_app_mode]=\${widgets[zle-line-init]#user:}'
+  O_AM=$((\${O_AM:-0}+1))'
+zle -N zle-line-init orca_test_app_mode
+`
+      )
+      const wrapper =
+        transport === 'local'
+          ? getZshShellReadyWrapperFile()
+          : buildZshStartupHook(getDaemonZshWrapperSpec())
+      writeFileSync(join(wrapperDir, '.zshenv'), wrapper)
+      writeFileSync(join(wrapperDir, ZSH_WRAPPER_DIR_MARKER_FILE), '')
+      const env: Record<string, string> = {
+        HOME: home,
+        USERPROFILE: home,
+        PATH: '/usr/bin:/bin',
+        DEBIAN_PREVENT_KEYBOARD_CHANGES: '1',
+        ZDOTDIR: wrapperDir
+      }
+      env.ORCA_SHELL_FEATURES = encodeShellStartupFeatures(
+        selectShellStartupFeatures({
+          shellPath: ZSH_PATH,
+          env,
+          hasStartupCommand: false,
+          waitsForShellReady: true,
+          emitsStartupIdentity: false
+        })
+      )
+
+      const result = await runZshPty({
+        env,
+        commands: [
+          'true',
+          'false',
+          '[[ ${functions[orca_test_app_mode]} == *__orca_deferred_line_init* ]]; O_CALL_REF=$?',
+          '__orca_deferred_line_init; O_NOOP=$?',
+          'O_INIT=${+functions[__orca_deferred_init]}'
+        ],
+        report: ['O_AM', 'O_CALL_REF', 'O_NOOP', 'O_INIT']
+      })
+
+      expect(result.output, result.output).not.toContain('command not found')
+      expect(result.output).toContain(MARKERS.ready)
+      expect(Number(result.values.O_AM)).toBeGreaterThan(2)
+      expect(result.values.O_CALL_REF).toBe('0')
+      expect(result.values.O_NOOP).toBe('0')
+      expect(result.values.O_INIT).toBe('0')
+    }
+  )
+})

src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt

@@ -44,13 +44,5 @@ export const ZSH_DEFERRED_LINE_INIT_RETIRE_BLOCK = `  if (( \${+widgets[__orca_s
     zle -D zle-line-init
   fi`
 
-// Why: add-zle-hook-widget can keep an alias of the bootstrap in its own chain.
-export const ZSH_DEFERRED_LINE_INIT_CLEANUP_BLOCK = `  (( $+__orca_deferred_sched_armed )) || builtin unfunction __orca_deferred_sched_init
-  local __orca_widget __orca_line_init_bound=0
-  for __orca_widget in "\${(v)widgets[@]}"; do
-    if [[ "$__orca_widget" == user:__orca_deferred_line_init ]]; then
-      __orca_line_init_bound=1
-      break
-    fi
-  done
-  (( __orca_line_init_bound )) || builtin unfunction __orca_deferred_line_init`
+// Why: plugins can copy a call to line-init into their own body; its guard makes it inert after startup.
+export const ZSH_DEFERRED_LINE_INIT_CLEANUP_BLOCK = `  (( $+__orca_deferred_sched_armed )) || builtin unfunction __orca_deferred_sched_init`