@mobius-os/mobius 0.3.15 → 0.3.24

package/src/components/ConfigFlow.tsx

@@ -0,0 +1,377 @@
+/**
+ * /model flow — pick a model, then create a brand-new session in the CURRENT
+ * task (Issue) with that model. Launched from inside the chat; Esc at any point
+ * before the session is created cancels back to the conversation untouched.
+ *
+ * The active Issue is intentionally NOT changed: /model only swaps the model and
+ * starts a fresh session, keeping the current project/task context. Esc-cancel is
+ * owned by ChatScreen (its useInput handles Esc while configOpen), so this
+ * component only ever reports a completed pick via onDone.
+ *
+ * Preferences are stored inside the current Issue (same model as PrepScreen):
+ *   updateIssuePreference — persist the chosen model on the active issue
+ * The session body mirrors useChat.ensureSession() so the pc_client_metadata
+ * (is_tui, aimux_id, local_path) matches lazily-created sessions exactly.
+ *
+ * ─────────────────────────────────────────────────────────────────────────────
+ * /config flow (ReconfigFlow) — full reconfiguration: (1) project → (2) issue →
+ * (3) model, then create a brand-new session. Unlike /model, this CAN change the
+ * active project and issue. Project/issue choices are persisted (bindCwdToProject,
+ * setCwdIssue, updateIssuePreference) so they become the new defaults.
+ */
+import React, { useEffect, useRef, useState } from 'react'
+import { Box, Text } from 'ink'
+import { Select, TextInput, Spinner, type SelectItem } from './primitives.js'
+import { MobiusClient } from '../api.js'
+import {
+  bindCwdToProject, cwd, getCwdPreference, loadDir2Project, loadProjectsCache,
+  saveProjectsCache, setCwdIssue, updateIssuePreference, type IssuePreference,
+} from '../config.js'
+import { tuiAimuxIdentifier } from '../aimux.js'
+import type { Issue, Project, SessionModelOption } from '../types.js'
+
+export interface ConfigResult {
+  /** If set, the project was also changed (from /config full reflow). */
+  project?: Project
+  issue: Issue
+  prefs: IssuePreference
+  sessionId: string
+}
+
+export function ConfigFlow({ client, issue, onDone }: {
+  client: MobiusClient
+  issue: Issue
+  onDone: (r: ConfigResult) => void
+}) {
+  const [step, setStep] = useState<'models' | 'creating'>('models')
+  const [models, setModels] = useState<SessionModelOption[] | null>(null)
+  const [defaultKey, setDefaultKey] = useState<string | null>(null)
+  const [status, setStatus] = useState('')
+  const doneRef = useRef(false)
+
+  // Guard against a setState after App has already remounted Chat (onDone fires
+  // a synchronous route change that unmounts us); also avoids double onDone.
+  useEffect(() => () => { doneRef.current = true }, [])
+
+  // Load the model list + default on mount (no issue step — the current Issue is used).
+  useEffect(() => {
+    Promise.all([
+      client.modelOptions().catch(() => [] as SessionModelOption[]),
+      client.defaultModel().then(r => r.model).catch(() => null),
+    ]).then(([opts, def]) => {
+      if (doneRef.current) return
+      setModels(opts)
+      setDefaultKey(def)
+    })
+  }, [client])
+
+  async function pickModel(model: string) {
+    setStep('creating')
+    try {
+      const prefs = await updateIssuePreference(cwd(), issue.id, { model })
+      if (doneRef.current) return
+      const s = await client.createSession(issue.id, {
+        name: `TUI ${new Date().toISOString().slice(5, 16).replace('T', ' ')}`,
+        model,
+        language: prefs.language,
+        excluded_skill_ids: prefs.excluded_skill_ids,
+        excluded_memory_ids: prefs.excluded_memory_ids,
+        pc_client_metadata: {
+          work_mode: 'pc',
+          aimux_id: tuiAimuxIdentifier(),
+          local_path: process.cwd(),
+          is_tui: true,
+          add_remote_aimux_mcp: true,
+        },
+      })
+      if (doneRef.current) return
+      onDone({ issue, prefs, sessionId: s.session_id })
+    } catch (e: any) {
+      if (doneRef.current) return
+      setStatus(`创建新会话失败: ${e?.message ?? e}`)
+      setStep('models')
+    }
+  }
+
+  if (step === 'creating') {
+    return (
+      <Box paddingX={2} paddingY={1}>
+        <Spinner label="正在创建新会话…" />
+      </Box>
+    )
+  }
+
+  return (
+    <Box flexDirection="column" paddingX={2} paddingY={1}>
+      <Text bold color="cyan">更换模型</Text>
+      <Text color="gray">当前任务: {issue.title}</Text>
+      {status ? <Text color="yellow">{status}</Text> : null}
+
+      <Box flexDirection="column">
+        <Text bold color="cyan">选择模型</Text>
+        <Text color="gray">确认后创建新会话（保留当前任务）</Text>
+        <Box marginTop={1}>
+          {models === null
+            ? <Text color="cyan">加载模型列表…</Text>
+            : models.length === 0
+              ? <Text color="gray">（无可用模型）</Text>
+              : <Select
+                  items={models.map(o => ({
+                    label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
+                    value: o.key,
+                    desc: o.sub,
+                  }))}
+                  onSelect={key => void pickModel(key)}
+                />}
+        </Box>
+        <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+      </Box>
+    </Box>
+  )
+}
+
+// ── /config: full reconfigure (project → issue → model) ─────────────────────
+
+type ReconfigStep = 'projects' | 'issues' | 'models' | 'creating'
+
+export function ReconfigFlow({ client, onDone }: {
+  client: MobiusClient
+  onDone: (r: ConfigResult) => void
+}) {
+  const [step, setStep] = useState<ReconfigStep>('projects')
+  const [projects, setProjects] = useState<Project[] | null>(null)
+  const [project, setProject] = useState<Project | null>(null)
+  const [issues, setIssues] = useState<Issue[] | null>(null)
+  const [issue, setIssue] = useState<Issue | null>(null)
+  const [models, setModels] = useState<SessionModelOption[] | null>(null)
+  const [defaultKey, setDefaultKey] = useState<string | null>(null)
+  const [status, setStatus] = useState('')
+  const [createName, setCreateName] = useState('')
+  const [createMode, setCreateMode] = useState<'project' | 'issue' | null>(null)
+  const doneRef = useRef(false)
+  const thisCwd = cwd()
+
+  useEffect(() => () => { doneRef.current = true }, [])
+
+  // Load projects on mount.
+  useEffect(() => {
+    ;(async () => {
+      let list = await loadProjectsCache()
+      try { list = await client.listProjects(); await saveProjectsCache(list) } catch { /* use cache */ }
+      if (doneRef.current) return
+      setProjects(list)
+    })().catch(e => { if (!doneRef.current) setStatus(`加载项目失败: ${e?.message ?? e}`) })
+  }, [client])
+
+  // Load issues when a project is picked.
+  useEffect(() => {
+    if (!project || step !== 'issues') return
+    ;(async () => {
+      try {
+        const iss = await client.listIssues(project.id, 'active')
+        if (doneRef.current) return
+        setIssues(iss)
+      } catch (e: any) {
+        if (!doneRef.current) setStatus(`加载任务失败: ${e?.message ?? e}`)
+      }
+    })()
+  }, [project, step, client])
+
+  // Load models when we reach the model step.
+  useEffect(() => {
+    if (step !== 'models') return
+    Promise.all([
+      client.modelOptions().catch(() => [] as SessionModelOption[]),
+      client.defaultModel().then(r => r.model).catch(() => null),
+    ]).then(([opts, def]) => {
+      if (doneRef.current) return
+      setModels(opts)
+      setDefaultKey(def)
+    })
+  }, [step, client])
+
+  // ── project ───────────────────────────────────────────────────────────────
+  async function pickProject(p: Project) {
+    await bindCwdToProject(thisCwd, p.id)
+    if (doneRef.current) return
+    setProject(p)
+    setIssues(null)
+    setStep('issues')
+  }
+
+  async function createProject(name: string) {
+    setCreateMode(null)
+    setStatus('创建项目…')
+    try {
+      const safeDir = '/' + (name || '未命名项目').replace(/[^a-zA-Z0-9一-鿿_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, 64) || 'project'
+      const p = await client.createProject({ name: name || '未命名项目', description: '', bindPath: safeDir, defaultUseWorktree: false })
+      const list = await client.listProjects(); await saveProjectsCache(list)
+      if (doneRef.current) return
+      setProjects(list)
+      await bindCwdToProject(thisCwd, p.id)
+      setProject(p)
+      setIssues(null)
+      setStep('issues')
+      setStatus('')
+    } catch (e: any) { if (!doneRef.current) setStatus(`创建项目失败: ${e?.message ?? e}`) }
+  }
+
+  // ── issue ─────────────────────────────────────────────────────────────────
+  async function pickIssue(iss: Issue) {
+    await setCwdIssue(thisCwd, iss.id, iss.title)
+    if (doneRef.current) return
+    setIssue(iss)
+    setStep('models')
+  }
+
+  async function createIssue(name: string) {
+    if (!project) return
+    setCreateMode(null)
+    setStatus('创建任务…')
+    try {
+      const iss = await client.createIssue(project.id, { title: name || '命令行任务', description: '由 TUI 创建', use_worktree: false })
+      const refreshed = await client.listIssues(project.id, 'active')
+      if (doneRef.current) return
+      setIssues(refreshed)
+      await pickIssue(iss)
+      setStatus('')
+    } catch (e: any) { if (!doneRef.current) setStatus(`创建任务失败: ${e?.message ?? e}`) }
+  }
+
+  // ── model → session ───────────────────────────────────────────────────────
+  async function pickModel(model: string) {
+    if (!project || !issue) return
+    setStep('creating')
+    try {
+      const prefs = await updateIssuePreference(thisCwd, issue.id, { model })
+      if (doneRef.current) return
+      const s = await client.createSession(issue.id, {
+        name: `TUI ${new Date().toISOString().slice(5, 16).replace('T', ' ')}`,
+        model,
+        language: prefs.language,
+        excluded_skill_ids: prefs.excluded_skill_ids,
+        excluded_memory_ids: prefs.excluded_memory_ids,
+        pc_client_metadata: {
+          work_mode: 'pc',
+          aimux_id: tuiAimuxIdentifier(),
+          local_path: process.cwd(),
+          is_tui: true,
+          add_remote_aimux_mcp: true,
+        },
+      })
+      if (doneRef.current) return
+      onDone({ project, issue, prefs, sessionId: s.session_id })
+    } catch (e: any) {
+      if (doneRef.current) return
+      setStatus(`创建新会话失败: ${e?.message ?? e}`)
+      setStep('models')
+    }
+  }
+
+  // ── render ────────────────────────────────────────────────────────────────
+  if (step === 'creating') {
+    return (
+      <Box paddingX={2} paddingY={1}>
+        <Spinner label="正在创建新会话…" />
+      </Box>
+    )
+  }
+
+  if (createMode === 'project') {
+    return (
+      <Box flexDirection="column" paddingX={2} paddingY={1}>
+        <Text bold color="cyan">创建新项目</Text>
+        <Text color="gray">{thisCwd}</Text>
+        <Box marginTop={1} flexDirection="column">
+          <Text color="cyan">项目名称 ←</Text>
+          <TextInput value={createName} onChange={setCreateName} focused placeholder="未命名项目"
+            onSubmit={() => createProject(createName)} onEscape={() => { setCreateMode(null); setCreateName('') }} />
+        </Box>
+        {status ? <Text color="yellow">{status}</Text> : null}
+        <Text color="gray">回车创建 · Esc 返回</Text>
+      </Box>
+    )
+  }
+
+  if (createMode === 'issue') {
+    return (
+      <Box flexDirection="column" paddingX={2} paddingY={1}>
+        <Text bold color="cyan">创建新任务</Text>
+        <Text color="gray">项目: {project?.name}</Text>
+        <TextInput value={createName} onChange={setCreateName} focused placeholder="命令行任务"
+          onSubmit={() => createIssue(createName)} onEscape={() => { setCreateMode(null); setCreateName('') }} />
+        {status ? <Text color="yellow">{status}</Text> : null}
+        <Text color="gray">回车创建 · Esc 返回</Text>
+      </Box>
+    )
+  }
+
+  return (
+    <Box flexDirection="column" paddingX={2} paddingY={1}>
+      <Text bold color="cyan">重新配置</Text>
+      {status ? <Text color="yellow">{status}</Text> : null}
+
+      {step === 'projects' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择项目</Text>
+          <Box marginTop={1}>
+            {projects === null
+              ? <Text color="cyan">加载项目列表…</Text>
+              : <Select
+                  items={[
+                    { label: '➕ 创建新项目', value: '__create__' },
+                    ...projects.map(p => ({ label: p.name, value: p.id, desc: p.description })),
+                  ]}
+                  onSelect={v => v === '__create__' ? setCreateMode('project') : pickProject(projects!.find(p => p.id === v)!)}
+                />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+
+      {step === 'issues' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择任务</Text>
+          <Text color="gray">项目: {project?.name}</Text>
+          <Box marginTop={1}>
+            {issues === null
+              ? <Text color="cyan">加载任务列表…</Text>
+              : issues.length === 0
+                ? <Select
+                    items={[{ label: '➕ 创建新任务（尚无任务）', value: '__create__' }]}
+                    onSelect={() => setCreateMode('issue')} />
+                : <Select
+                    items={[
+                      { label: '➕ 创建新任务', value: '__create__' },
+                      ...issues.map(i => ({ label: i.title, value: i.id, desc: i.description })),
+                    ]}
+                    onSelect={v => v === '__create__' ? setCreateMode('issue') : pickIssue(issues!.find(i => i.id === v)!)} />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+
+      {step === 'models' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择模型</Text>
+          <Text color="gray">项目: {project?.name} · 任务: {issue?.title}</Text>
+          <Box marginTop={1}>
+            {models === null
+              ? <Text color="cyan">加载模型列表…</Text>
+              : models.length === 0
+                ? <Text color="gray">（无可用模型）</Text>
+                : <Select
+                    items={models.map(o => ({
+                      label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
+                      value: o.key,
+                      desc: o.sub,
+                    }))}
+                    onSelect={key => void pickModel(key)}
+                  />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+    </Box>
+  )
+}

package/src/components/PrepScreen.tsx

@@ -116,7 +116,14 @@ export function PrepScreen({ client, onReady, onQuit }: {
   async function createProject(name: string, description: string) {
     setStatusMsg('创建项目…')
     try {
-      const p = await client.createProject({ name: name || '未命名项目', description, bindPath: thisCwd, defaultUseWorktree: false })
+      // bindPath 是 mobius 服务器上的工作目录，不应使用 TUI 客户端的 process.cwd()。
+      // TUI 可能运行在不同机器/OS 上（尤其是通过 aimux 连接时），
+      // 客户端 cwd 对服务器无意义（Windows 路径如 C:\Users\... 在 Linux 上会被误解析为相对路径）。
+      // 用项目名+随机后缀生成唯一服务器端子目录，由服务器 resolveBindPath 拼到用户 work_dir 下。
+      const slug = (name || '未命名项目').replace(/[^a-zA-Z0-9一-鿿_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, 56) || 'project'
+      const suffix = require('crypto').randomBytes(3).toString('hex')
+      const safeDir = `/${slug}-${suffix}`
+      const p = await client.createProject({ name: name || '未命名项目', description, bindPath: safeDir, defaultUseWorktree: false })
       const list = await client.listProjects(); await saveProjectsCache(list); setProjects(list)
       await bindCwdToProject(thisCwd, p.id)
       await enterProject(p, list)

package/src/components/primitives.tsx

@@ -4,24 +4,32 @@
  */
 import React, { useEffect, useRef, useState } from 'react'
 import { Box, Text, useInput, useStdout, useStdin } from 'ink'
+import { useDeleteKeyCapture, applyDeleteIntent } from '../lib/delete-keys.js'
 
 /** Windows Terminal/ConPTY may expose Esc as a named key, a raw byte, or Ctrl+[. */
 export function isEscapeKeypress(input: string, key: { escape?: boolean; ctrl?: boolean }): boolean {
   return key.escape === true || input === '\x1b' || (key.ctrl === true && input === '[')
 }
 
-// ─── Mouse wheel ─────────────────────────────────────────────────────────────
-// Terminals report wheel events only after DECSET 1000 (button-event) + 1006
-// (SGR coordinates) are enabled. A wheel tick arrives as a mouse sequence:
-//   wheel up   → ESC [ < 64 ; x ; y M   (SGR, the modern encoding)
-//   wheel down → ESC [ < 65 ; x ; y M
-// Legacy X10 (no SGR support) reports ESC [ M Cb Cx Cy with Cb = button + 32,
-// so wheel up is 0x60 (`) and wheel down is 0x61 (a). There is no release event
-// for the wheel in either form. Button 64/65 map to a delta of +1/-1 so the
-// transcript pager can scroll back/forward by a fixed step.
+// ─── Mouse events ────────────────────────────────────────────────────────────
+// Terminals report mouse events only after DECSET 1000 (button-event) + 1002
+// (cell motion while a button is held) + 1006 (SGR coordinates) are enabled.
+// An event arrives as a sequence:
+//   press   → ESC [ < b ; x ; y M     b = 0/1/2 (left/middle/right)
+//   release → ESC [ < b ; x ; y m     b = 0/1/2
+//   motion  → ESC [ < b ; x ; y M     b = 32/33/34 (drag with button 0/1/2)
+//   wheel   → ESC [ < 64 ; x ; y M    (up) / < 65 (down), no release event
+// Legacy X10 (no SGR support) reports ESC [ M Cb Cx Cy with Cb = button + 32
+// (0x20 left, 0x23 release, 0x40 left-drag, 0x60 wheel-up, 0x61 wheel-down).
+// Coordinates are 1-based in SGR and offset by 32 in X10; both are normalized
+// to 0-based row/col here.
 const SGR_MOUSE_RE = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g
 const LEGACY_MOUSE_RE = /\x1b\[M([\s\S]{3})/g
 
+export type MouseEventInfo =
+  | { kind: 'wheel'; delta: number }
+  | { kind: 'press' | 'release' | 'motion'; button: number; row: number; col: number }
+
 /**
  * True when `input` (a chunk Ink forwarded to useInput handlers) begins with a
  * mouse event. Ink strips a leading ESC before passing `input`, so both the raw
@@ -34,61 +42,94 @@ export function isMouseInput(input: string): boolean {
 
 /** Extract the wheel delta from a chunk: +1 wheel-up, -1 wheel-down, else 0. */
 export function mouseWheelDelta(input: string): number {
-  SGR_MOUSE_RE.lastIndex = 0
   let delta = 0
+  for (const e of parseMouseEvents(input)) if (e.kind === 'wheel') delta += e.delta
+  return delta
+}
+
+/** Parse every mouse event in a chunk (may contain several; fast scroll batches). */
+export function parseMouseEvents(input: string): MouseEventInfo[] {
+  const out: MouseEventInfo[] = []
+  SGR_MOUSE_RE.lastIndex = 0
   let m: RegExpExecArray | null
   while ((m = SGR_MOUSE_RE.exec(input)) !== null) {
     const btn = Number(m[1])
-    if (btn === 64) delta++
-    else if (btn === 65) delta--
+    const row = Number(m[3]) - 1
+    const col = Number(m[2]) - 1
+    const down = m[4] === 'M'
+    if (btn === 64) out.push({ kind: 'wheel', delta: 1 })
+    else if (btn === 65) out.push({ kind: 'wheel', delta: -1 })
+    else if (btn >= 32 && btn <= 34) out.push({ kind: 'motion', button: btn - 32, row, col })
+    else if (btn <= 2) out.push({ kind: down ? 'press' : 'release', button: btn, row, col })
   }
   LEGACY_MOUSE_RE.lastIndex = 0
   let lm: RegExpExecArray | null
   while ((lm = LEGACY_MOUSE_RE.exec(input)) !== null) {
-    const btn = lm[1].charCodeAt(0) - 32 // X10 adds a 32 offset to the button
-    if (btn === 64) delta++
-    else if (btn === 65) delta--
+    const bytes = lm[1]
+    const btn = bytes.charCodeAt(0) - 32
+    const row = bytes.charCodeAt(2) - 32 - 1
+    const col = bytes.charCodeAt(1) - 32 - 1
+    if (btn === 64) out.push({ kind: 'wheel', delta: 1 })
+    else if (btn === 65) out.push({ kind: 'wheel', delta: -1 })
+    else if (btn >= 32 && btn <= 34) out.push({ kind: 'motion', button: btn - 32, row, col })
+    else if (btn === 3) out.push({ kind: 'release', button: 0, row, col })
+    else if (btn <= 2) out.push({ kind: 'press', button: btn, row, col })
   }
-  return delta
+  return out
 }
 
 /**
  * Enables terminal mouse tracking for the lifetime of the calling component and
- * forwards wheel deltas to `onWheel`. Mouse events reach the rest of Ink as raw
- * input chunks, so any text-inserting useInput handler must guard with
- * `isMouseInput(input)`.
+ * forwards mouse events (wheel + left-button press/motion/release) to the given
+ * handlers. Mouse events reach the rest of Ink as raw input chunks, so any
+ * text-inserting useInput handler must guard with `isMouseInput(input)`.
  *
  * The DECSET enable/disable sequences are only written when stdout is a TTY
  * (writing them into a pipe would litter the output). The emitter listener is
- * attached unconditionally so the harness can simulate wheel events.
+ * attached unconditionally so the harness can simulate mouse events.
+ *
+ * Trade-off: terminal mouse reporting (DECSET 1000) hands the mouse to the app,
+ * so native drag-to-select is disabled while it is on. The app therefore draws
+ * its own selection (tmux-style) and copies via OSC 52. Users who prefer native
+ * selection can opt out with `MOBIUS_TUI_DISABLE_MOUSE=1`.
  */
-export function useMouseWheel(onWheel: (delta: number) => void): void {
+export function useMouseEvents(handlers: {
+  onWheel?: (delta: number) => void
+  onPress?: (row: number, col: number) => void
+  onMotion?: (row: number, col: number) => void
+  onRelease?: (row: number, col: number) => void
+}): void {
   const { internal_eventEmitter } = useStdin()
   const { stdout } = useStdout()
-  const cbRef = useRef(onWheel)
-  cbRef.current = onWheel
+  const refs = useRef(handlers)
+  refs.current = handlers
 
   useEffect(() => {
     if (!internal_eventEmitter) return
+    if (process.env.MOBIUS_TUI_DISABLE_MOUSE === '1') return
     const isTTY = Boolean(stdout.isTTY)
-    if (isTTY) stdout.write('\x1b[?1000h\x1b[?1006h')
+    if (isTTY) stdout.write('\x1b[?1000h\x1b[?1002h\x1b[?1006h')
     let buf = ''
     const handler = (chunk: unknown) => {
-      // A single read() chunk may carry several wheel ticks (fast scrolling) and
-      // an SGR sequence may be split across chunks, so accumulate and re-scan.
+      // A single read() chunk may carry several events and a sequence may be
+      // split across chunks, so accumulate and re-scan.
       buf += String(chunk)
-      const delta = mouseWheelDelta(buf)
+      for (const e of parseMouseEvents(buf)) {
+        if (e.kind === 'wheel') refs.current.onWheel?.(e.delta)
+        else if (e.kind === 'press') refs.current.onPress?.(e.row, e.col)
+        else if (e.kind === 'motion') refs.current.onMotion?.(e.row, e.col)
+        else refs.current.onRelease?.(e.row, e.col)
+      }
       // Drop the fully-matched sequences, keeping any trailing partial escape
       // prefix so a split sequence still matches on the next chunk.
       buf = buf.replace(SGR_MOUSE_RE, '').replace(LEGACY_MOUSE_RE, '')
       const esc = buf.lastIndexOf('\x1b')
       buf = esc >= 0 ? buf.slice(esc) : ''
-      if (delta !== 0) cbRef.current(delta)
     }
     internal_eventEmitter.on('input', handler)
     return () => {
       internal_eventEmitter.off('input', handler)
-      if (isTTY) stdout.write('\x1b[?1000l\x1b[?1006l')
+      if (isTTY) stdout.write('\x1b[?1000l\x1b[?1002l\x1b[?1006l')
     }
   }, [internal_eventEmitter, stdout])
 }
@@ -130,6 +171,20 @@ export function TextInput(props: TextInputProps) {
     setCursor(nextCursor)
   }
 
+  // Physical Backspace/Delete keys are owned by useDeleteKeyCapture from the
+  // raw stdin bytes — Ink reports the Backspace key (\x7f) and the Delete key
+  // (ESC[3~) both as `key.delete`, so handling `key.delete` in useInput would
+  // delete in the wrong direction. Refs keep the hook's callback on the latest
+  // value/cursor without re-subscribing.
+  const valueRef = useRef(value)
+  const cursorRef = useRef(cursor)
+  valueRef.current = value
+  cursorRef.current = cursor
+  useDeleteKeyCapture(focused, (intent) => {
+    const { text, cursor: nextCursor } = applyDeleteIntent(valueRef.current, cursorRef.current, intent)
+    edit(text, nextCursor)
+  })
+
   useInput((input, key) => {
     if (isMouseInput(input)) return
     if (key.return) { props.onSubmit?.(); return }
@@ -137,21 +192,21 @@ export function TextInput(props: TextInputProps) {
     if (key.downArrow) { props.onArrowDown?.(); return }
     if (isEscapeKeypress(input, key)) { props.onEscape?.(); return }
     if (key.tab) { props.onTab?.(); return }
-    // Ink labels the \x7f that virtually every terminal's Backspace key emits
-    // as `key.delete` (see its parse-keypress.js TODO). Treat either signal as
-    // a backward delete — otherwise Backspace at the end of the input is a no-op.
-    if (key.backspace || key.delete || (key.ctrl && input === 'h')) {
-      if (cursor > 0) {
-        // delete word on Ctrl+W
-        if (key.ctrl && input === 'w') {
-          const before = value.slice(0, cursor)
-          const m = before.match(/\S+\s*$/)
-          const cut = m ? m[0].length : 0
-          edit(value.slice(0, cursor - cut) + value.slice(cursor), cursor - cut)
-        } else {
-          edit(value.slice(0, cursor - 1) + value.slice(cursor), cursor - 1)
-        }
-      }
+    // Only the unambiguous logical editing bindings stay here; the physical
+    // delete keys are handled above via useDeleteKeyCapture.
+    if (key.ctrl && input === 'w') {
+      const { text, cursor: nextCursor } = applyDeleteIntent(value, cursor, 'backward-word')
+      edit(text, nextCursor)
+      return
+    }
+    if (key.ctrl && input === 'h') {
+      const { text, cursor: nextCursor } = applyDeleteIntent(value, cursor, 'backward')
+      edit(text, nextCursor)
+      return
+    }
+    if (key.ctrl && input === 'd') {
+      const { text, cursor: nextCursor } = applyDeleteIntent(value, cursor, 'forward')
+      edit(text, nextCursor)
       return
     }
     if (key.leftArrow) { setCursor(c => Math.max(0, c - 1)); return }