Merge branch 'escape'

Author: capocasa

config.example

@@ -24,6 +24,20 @@ current = "baseten.glm5"
 ; patient_retry = off ; disable patient retry of 429/5xx/network errors (on by default: ~36h hold so a long-running session rides out a usage limit or network dropout without dropping to the prompt)
 ; sandbox_wall_warn = off ; silence the Windows "wall not set up" warning (host rules in policy, no `3code wall setup-windows` yet)
 ; bash_path = "C:\\tools\\msys64\\usr\\bin\\bash.exe"  ; Windows only: override bash detection
+;
+; [shortcuts] remaps editor commands. Value is a space-separated list of
+; keys; empty string unbinds. Defaults match today's hardcoded behaviour.
+; Key syntax: ESC / Escape, CtrlX / Ctrl+X, AltX / Alt+X, Home, End, Up,
+; Down, Left, Right, Insert, Delete, Backspace, Tab, ShiftTab. Prefix
+; Double for two consecutive presses (DoubleCtrlC, DoubleESC).
+; Commands: cancel, clear, quit-if-empty, home, end, left, right,
+; word-left, word-right, up, down, history-previous, history-next,
+; backspace, delete, insert, delete-word-left, delete-to-boundary-left,
+; clear-screen, suspend, complete, reverse-complete, edit-in-editor,
+; insert-newline. `clear` also adds the discarded text to history.
+; [shortcuts]
+; cancel = "DoubleESC CtrlC"
+; clear = "ESC"
 
 # Colour tone. 3code detects dark vs light background automatically by
 # querying the terminal background (OSC 11). Set `tone` to pin it instead

src/threecode/api.nim

@@ -1799,18 +1799,34 @@ proc stripInternalFields*(messages: JsonNode): JsonNode =
   ## rejected by strict validators (fireworks, glm-5p1, etc.). `finish_reason`
   ## is attached to empty assistant turns so the turn loop can branch on it
   ## but is not a wire field. `interrupted` marks user-cancelled turns.
+  ## Empty assistant `content` is filled with a placeholder: OpenAI-style
+  ## validators (xAI, OpenAI, Moonshot) 400 on `role: assistant` with an
+  ## empty content string, which is how a thinking-only / length-starved
+  ## turn looks after `reasoning_content` is stripped for non-DeepSeek.
   if messages == nil or messages.kind != JArray: return messages
   result = newJArray()
   for m in messages:
-    if m.kind != JObject or
-       ("usage" notin m and "interrupted" notin m and "finish_reason" notin m):
-      result.add m
-      continue
-    var clean = newJObject()
-    for k, v in m.pairs:
-      if k != "usage" and k != "interrupted" and k != "finish_reason":
-        clean[k] = v
-    result.add clean
+    var node = m
+    if m.kind == JObject and
+       ("usage" in m or "interrupted" in m or "finish_reason" in m):
+      var clean = newJObject()
+      for k, v in m.pairs:
+        if k != "usage" and k != "interrupted" and k != "finish_reason":
+          clean[k] = v
+      node = clean
+    if node.kind == JObject and node{"role"}.getStr == "assistant":
+      let tcs = node{"tool_calls"}
+      let hasToolCalls = tcs != nil and tcs.kind == JArray and tcs.len > 0
+      if not hasToolCalls and node{"content"}.getStr.strip.len == 0:
+        if node != m:
+          node["content"] = %EmptyReplyMsg
+        else:
+          var filled = newJObject()
+          for k, v in node.pairs:
+            filled[k] = v
+          filled["content"] = %EmptyReplyMsg
+          node = filled
+    result.add node
 
 proc ensureReasoningField(messages: JsonNode) =
   ## DeepSeek-R1 with thinking mode rejects any request whose history
@@ -1854,8 +1870,13 @@ proc applyGlmReasoning(p: Profile, body: JsonNode) =
   ## - `chat_template_kwargs.enable_thinking` (bool) on vLLM stacks (nvidia,
   ##   hetzner); other vLLM GLM providers (nebius, deepinfra, fireworks)
   ##   accept the same knob but always think when it's omitted.
-  ## Inert stacks (baseten, cerebras) accept nothing and always think, so
-  ## `off` is silently a no-op there.
+  ## - GLM-5.3 on every remaining hosted stack (baseten, novita, deepinfra,
+  ##   fireworks, venice, nanogpt, cheaperinference, ...) gets a top-level
+  ##   `reasoning_effort` (`low`/`high`/`max`). 5.3 is forced-thinking: with
+  ##   no effort knob the default high/max thinking burns the whole
+  ##   max_tokens budget and the turn comes back as an empty `length` reply.
+  ## Inert stacks (cerebras) accept nothing and always think, so `off` is
+  ## silently a no-op there.
   # GLM-5.2 and 5.3 are the GLMs with a graded effort knob (variants "2"
   # and "3"); every other GLM is on/off. Variant encodes the minor version
   # digit (4.7 -> "7", 5.1 -> "1", 5.2 -> "2", 5.3 -> "3").
@@ -1876,7 +1897,11 @@ proc applyGlmReasoning(p: Profile, body: JsonNode) =
       of "max": body["thinking"] = %*{"type": "enabled", "effort": "max"}
       else: discard
   of "together":
-    if glm52:
+    if glm53:
+      case p.reasoning
+      of "low", "high", "max": body["reasoning_effort"] = %p.reasoning
+      else: discard
+    elif glm52:
       case p.reasoning
       of "off": body["reasoning"] = %*{"enabled": false}
       of "max": body["reasoning_effort"] = %"max"
@@ -1893,10 +1918,22 @@ proc applyGlmReasoning(p: Profile, body: JsonNode) =
       of "max": body["reasoning"] = %*{"effort": "xhigh"}
       else: body["reasoning"] = %*{"effort": "high"}
   of "nvidia", "hetzner":
-    case p.reasoning
-    of "off": body["chat_template_kwargs"] = %*{"enable_thinking": false}
-    else: discard
-  else: discard
+    if glm53:
+      case p.reasoning
+      of "low", "high", "max": body["reasoning_effort"] = %p.reasoning
+      else: discard
+    else:
+      case p.reasoning
+      of "off": body["chat_template_kwargs"] = %*{"enable_thinking": false}
+      else: discard
+  else:
+    # Hosted OpenAI-compatible stacks that don't have a dedicated branch
+    # (baseten, novita, deepinfra, fireworks, venice, nanogpt, ...).
+    # GLM-5.3 needs the effort knob or thinking starves the output budget.
+    if glm53:
+      case p.reasoning
+      of "low", "high", "max": body["reasoning_effort"] = %p.reasoning
+      else: discard
 
 proc applyStreamingOptions*(p: Profile, body: JsonNode) =
   ## Provider-specific additions for SSE fidelity.
@@ -2401,7 +2438,7 @@ proc callModel*(p: Profile, messages: JsonNode, usage: var Usage,
       "chat/completions rejects it, use a chat variant instead")
   if p.family == "deepseek":
     ensureReasoningField(messages)
-  let wireMessages = stripInternalFields(messages)
+  let wireMessages = repairToolCallPairing(stripInternalFields(messages))
   if p.family != "deepseek":
     for m in wireMessages:
       if m.kind == JObject and m{"role"}.getStr == "assistant" and m.contains("reasoning_content"):

src/threecode/compact.nim

@@ -67,17 +67,26 @@ proc applySummary*(messages: JsonNode, summary: string,
   if messages[0]{"role"}.getStr != "system": return 0
   if summary.strip.len == 0: return 0
   let system = messages[0]
-  let tailStart = messages.len - keepRecent
-  var tail = newSeq[JsonNode](keepRecent)
-  for i in 0 ..< keepRecent:
-    tail[i] = messages[tailStart + i]
+  var tailStart = messages.len - keepRecent
+  # Never start the retained suffix on a `role:tool` message: that orphans
+  # the result from its assistant `tool_calls` and Kimi/Moonshot 400 with
+  # `tool_call_id is not found`. Walk back to the owning assistant.
+  while tailStart > 1 and messages[tailStart]{"role"}.getStr == "tool":
+    dec tailStart
+  var tail = newSeq[JsonNode]()
+  for i in tailStart ..< messages.len:
+    tail.add messages[i]
   let collapsed = tailStart - 1  # messages dropped from the middle
   let synthetic = %*{"role": "user",
                      "content": SummaryPrefix & summary.strip}
   let rebuilt = newJArray()
   rebuilt.add system
   rebuilt.add synthetic
   for m in tail: rebuilt.add m
+  # Drop any leftover leading tool results and pair unanswered tool_calls.
+  let paired = repairToolCallPairing(rebuilt)
+  rebuilt.elems.setLen 0
+  for m in paired: rebuilt.add m
   # Replace `messages` contents in place so callers holding the ref see it.
   # elems is a public exported field on JArray; this is the canonical
   # way to clear a JArray while keeping ref identity for callers.

src/threecode/config.nim

@@ -14,7 +14,7 @@
 import std/[os, parsecfg, sequtils, streams, strformat, strutils, tables, terminal, uri]
 when defined(posix):
   import std/posix except SocketHandle
-import types, prompts, util, auth_openai, modelname
+import types, prompts, util, auth_openai, modelname, minline
 
 type
   ProviderRec* = object
@@ -101,6 +101,10 @@ var activeSearchEngine*: string = "exa"
   ## used as-is, and a missing key is an error only if that engine needs one
   ## (brave does; exa and parallel are keyless by default).
 
+var activeShortcuts*: Table[string, string]
+  ## [shortcuts] map loaded from the active config, exposed so minline can
+  ## apply the user's bindings at startup and after config reloads.
+
 var bashPathOverride*: string
   ## Windows-only. `[settings]` `bash_path = "..."` overrides MSYS2
   ## detection in `streamexec.resolveBash` for users with bash at a
@@ -282,7 +286,7 @@ type
     ## can report `path:line:` for a bad section/key/value without re-reading.
 
 const
-  PermittedSections = ["settings", "search", "colors", "provider"]
+  PermittedSections = ["settings", "search", "colors", "provider", "shortcuts"]
   SettingsKeys = ["current", "notify", "streaming", "sandbox",
                   "sandbox_enabled", "patient_retry", "patient-retry",
                   "sandbox_wall_warn",
@@ -307,6 +311,7 @@ proc permittedKey(section, key: string): bool =
     let base = if key.endsWith("-light"): key[0 ..< key.len - 6] else: key
     base in ColorKeys
   of "provider": key in ProviderKeys
+  of "shortcuts": key in minline.ShortcutNames
   else: false
 
 proc validateConfig*(path: string; entries: seq[RawEntry]): string =
@@ -325,8 +330,10 @@ proc validateConfig*(path: string; entries: seq[RawEntry]): string =
     if ent.value.strip == "":
       # Empty key is fine for auth=oauth providers (and is also a structural
       # gap loadProfile diagnoses). Empty current/url/models likewise.
+      # Empty [shortcuts] values are explicit unbinds, so they are allowed.
       if not (ent.section == "provider" and ent.key == "key") and
-         not (ent.section == "settings" and ent.key == "current"):
+         not (ent.section == "settings" and ent.key == "current") and
+         not (ent.section == "shortcuts"):
         return &"{path}:{ent.line}: empty value for '{ent.key}' in [{ent.section}]"
     case ent.section
     of "search":
@@ -345,12 +352,18 @@ proc validateConfig*(path: string; entries: seq[RawEntry]): string =
           ent.value.strip.toLowerAscii notin ColorModes:
         return &"{path}:{ent.line}: unknown tone '{ent.value}' " &
                "(expected one of: auto, dark, light)"
+    of "shortcuts":
+      if ent.value.strip != "":
+        try:
+          discard minline.parseShortcutSpec(ent.value)
+        except ValueError:
+          return &"{path}:{ent.line}: invalid shortcut value '{ent.value}' for '{ent.key}'"
     else: discard
   ""
 
-proc parseConfigFile*(path: string): (string, seq[ProviderRec], Table[string, string], Table[string, string], string) =
+proc parseConfigFile*(path: string): (string, seq[ProviderRec], Table[string, string], Table[string, string], string, Table[string, string]) =
   ## Streaming parse so that repeated [provider] sections accumulate as a list.
-  ## Returns `(current, providers, colors, searchKeys, searchEngine)`.
+  ## Returns `(current, providers, colors, searchKeys, searchEngine, shortcuts)`.
   ## `searchKeys` maps engine name -> key for each `[search] exa-key` /
   ## `brave-key` set (empty table when none). A legacy bare `[search] key`
   ## is accepted and filed under the active engine for backward compat.
@@ -363,6 +376,7 @@ proc parseConfigFile*(path: string): (string, seq[ProviderRec], Table[string, st
   var searchEngine = ""
   var providers: seq[ProviderRec]
   var colors: Table[string, string]
+  var shortcuts: Table[string, string]
   var section = ""
   var prov: ProviderRec
   var inProvider = false
@@ -480,13 +494,15 @@ proc parseConfigFile*(path: string): (string, seq[ProviderRec], Table[string, st
         of "reasonings": prov.reasonings = splitModels(v).mapIt(it.toLowerAscii)
         of "auth": prov.auth = v.strip.toLowerAscii
         else: discard
+      of "shortcuts":
+        shortcuts[e.key] = v
       else: discard
     of cfgError:
       die &"{path}: {e.msg}", ExitConfig
   p.close
   let verr = validateConfig(path, entries)
   if verr != "": die verr, ExitConfig
-  (current, providers, colors, searchKeys, searchEngine)
+  (current, providers, colors, searchKeys, searchEngine, shortcuts)
 
 func quoteVal(s: string): string =
   result = "\""
@@ -532,6 +548,10 @@ proc writeConfigFile*(path: string, current: string,
   if colorModePref != cmAuto:
     let label = if colorModePref == cmDark: "dark" else: "light"
     buf.add "tone = " & quoteVal(label) & "\n"
+  if activeShortcuts.len > 0:
+    buf.add "\n[shortcuts]\n"
+    for cmd, spec in activeShortcuts:
+      buf.add cmd & " = " & quoteVal(spec) & "\n"
   for pr in providers:
     buf.add "\n[provider]\n"
     buf.add "name = " & quoteVal(pr.name) & "\n"
@@ -565,14 +585,16 @@ proc resolveSearchKey*(engine: string; keys: Table[string, string]): string =
 
 proc loadStateOrEmpty*(path: string): (string, seq[ProviderRec], Table[string, string]) =
   ## Returns `(current, providers, colors)` and updates `activeSearchKey` /
-  ## `activeSearchEngine` / `activeSearchKeys` as a side effect when the config
-  ## sets them. `colors` is the flat `[colors]` map for the caller to route
-  ## through the cascade. Missing file is benign.
+  ## `activeSearchEngine` / `activeSearchKeys` / `activeShortcuts` as a side
+  ## effect when the config sets them. `colors` is the flat `[colors]` map
+  ## for the caller to route through the cascade. Missing file is benign.
   if not fileExists(path): return ("", @[], initTable[string, string]())
-  let (current, providers, colors, searchKeys, searchEngine) = parseConfigFile(path)
+  let (current, providers, colors, searchKeys, searchEngine, shortcuts) = parseConfigFile(path)
   if searchEngine != "": activeSearchEngine = searchEngine
   activeSearchKeys = searchKeys
   activeSearchKey = resolveSearchKey(activeSearchEngine, activeSearchKeys)
+  activeShortcuts = shortcuts
+  minline.configuredShortcuts = activeShortcuts
   (current, providers, colors)
 
 proc resolveFamily*(prov: ProviderRec, prof: Profile): string =
@@ -657,10 +679,12 @@ proc loadProfile*(wanted: string): Profile =
     stderr.writeLine ""
     stderr.writeLine ConfigExample
     quit ExitConfig
-  let (current, providers, _, searchKeys, searchEngine) = parseConfigFile(path)
+  let (current, providers, _, searchKeys, searchEngine, shortcuts) = parseConfigFile(path)
   if searchEngine != "": activeSearchEngine = searchEngine
   activeSearchKeys = searchKeys
   activeSearchKey = resolveSearchKey(activeSearchEngine, activeSearchKeys)
+  activeShortcuts = shortcuts
+  minline.configuredShortcuts = activeShortcuts
   if providers.len == 0:
     die &"no [provider] section in {path}", ExitConfig
   var pick = wanted

src/threecode/display.nim

@@ -22,7 +22,7 @@
 ## since it drops below readable contrast on light backgrounds and has no
 ## clean mode switch.
 
-import std/[critbits, exitprocs, json, os, strformat, strutils, terminal]
+import std/[critbits, exitprocs, json, os, strformat, strutils, tables, terminal]
 import types, util, config, prompts, session, actions, minline, toolstream
 import terminal as termui
 
@@ -662,20 +662,45 @@ var navigatedUp*: bool = false
 var origDown, origUp: proc(ed: var LineEditor) {.closure.}
 
 proc installEditorTweaks*() =
+  # The default Up/Down bindings move by visual row and fall through to
+  # history navigation at the boundary. Wrap those command callbacks so
+  # the UI can tell whether the user has moved into history. Make sure
+  # KEYMAP is populated (including cmd:* entries from applyShortcuts)
+  # before we try to wrap its entries. welcome() runs before the first
+  # readLineWith, so initKeyTables alone is not enough.
+  initKeyTables()
+  applyShortcuts(configuredShortcuts)
+  # Arrow keys still go through KEYMAP["up"]/"down"] (handleEscape
+  # fallback) and CommandProcsAll (SEQCMDS). Wrap all three so history
+  # navigation is tracked regardless of which path fires.
   origUp = KEYMAP["up"]
   origDown = KEYMAP["down"]
-  KEYMAP["up"] = proc(ed: var LineEditor) =
+  let wrapUp = proc(ed: var LineEditor) =
     origUp(ed)
     navigatedUp = true
-  KEYMAP["down"] = proc(ed: var LineEditor) =
+  let wrapDown = proc(ed: var LineEditor) =
     origDown(ed)
     if navigatedUp:
       navigatedUp = false
-  # also reset the flag when the line is cleared via ctrl+u
-  let origClear = KEYMAP["ctrl+u"]
-  KEYMAP["ctrl+u"] = proc(ed: var LineEditor) =
+  KEYMAP["up"] = wrapUp
+  KEYMAP["down"] = wrapDown
+  KEYMAP["cmd:up"] = wrapUp
+  KEYMAP["cmd:down"] = wrapDown
+  # CommandProcs is the source applyShortcuts copies into each thread's
+  # CommandProcsAll / KEYMAP["cmd:*"], so wrapping it here survives the
+  # input thread's later applyShortcuts.
+  CommandProcs["up"] = wrapUp
+  CommandProcs["down"] = wrapDown
+  CommandProcsAll["up"] = wrapUp
+  CommandProcsAll["down"] = wrapDown
+  # also reset the flag when the line is cleared
+  let origClear = KEYMAP["cmd:clear"]
+  let wrapClear = proc(ed: var LineEditor) =
     origClear(ed)
     navigatedUp = false
+  KEYMAP["cmd:clear"] = wrapClear
+  CommandProcs["clear"] = wrapClear
+  CommandProcsAll["clear"] = wrapClear
 
 proc welcome*(p: Profile): minline.LineEditor =
   termui.setSteadyCursor()

src/threecode/fatprompt/runtime.nim

@@ -1447,11 +1447,11 @@ when defined(posix):
         if n > 0:
           for i in 0 ..< n.int:
             let b = buf[i].uint8
-            if b == 0x03 or b == 0x1b:
-              {.cast(gcsafe).}:
+            {.cast(gcsafe).}:
+              if b in cancelWatchSnapshot:
                 requestTurnInterrupt()
                 restoreCancelTermios()
-              return
+                return
 
   proc drainCancelInput() =
     if isatty(0.cint) == 0: return
@@ -1529,7 +1529,7 @@ proc installWizardVerifyCancel*(jobDone: proc(): bool {.closure.};
               if n > 0:
                 for i in 0 ..< n.int:
                   let b = buf[i].uint8
-                  if b == 0x03 or b == 0x1b:
+                  if b in cancelWatchSnapshot:
                     cancelJob()
                     return true
           return false