@zachjxyz/moxie 0.5.0 → 0.6.0

package/bin/moxie

@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.5.0"
+MOXIE_VERSION="0.6.0"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do

package/lib/agents.sh

@@ -368,21 +368,23 @@ print('1' if d.get('$name', False) else '0')
 # Persist degradation state to disk (called after degrading an agent)
 _save_degraded() {
     local deg_file="$MOXIE_DIR/degraded.json"
+    local deg_tmp="${deg_file}.tmp"
     python3 -c "
-import json
+import json, sys
 existing = {}
 try:
     with open('$deg_file') as f:
         existing = json.load(f)
 except: pass
 names = '${AGENT_NAMES[*]}'.split()
+degraded_flags = '${AGENT_DEGRADED[*]}'.split()
 for i, name in enumerate(names):
-    degraded_flags = '${AGENT_DEGRADED[*]}'.split()
     if i < len(degraded_flags) and degraded_flags[i] == '1':
         existing[name] = True
-with open('$deg_file', 'w') as f:
+with open('$deg_tmp', 'w') as f:
     json.dump(existing, f, indent=2)
-" 2>/dev/null
+" || { echo "WARNING: Failed to save degradation state" >&2; return; }
+    mv "$deg_tmp" "$deg_file"
 }
 
 # Returns 0 if the agent is degraded, 1 otherwise.
@@ -398,10 +400,11 @@ is_agent_degraded() {
 }
 
 # Record a productive or non-productive turn for an agent.
-# Usage: _record_turn_health <agent_name> <logfile>
+# Usage: _record_turn_health <agent_name> <logfile> [exit_code]
 _record_turn_health() {
     local name="$1"
     local logfile="$2"
+    local exit_code="${3:-0}"
 
     local idx=-1
     for i in "${!AGENT_NAMES[@]}"; do
@@ -419,9 +422,13 @@ _record_turn_health() {
         log_size=$(wc -c < "$logfile" | tr -d ' ')
     fi
 
-    # Check for known failure signatures in the log
+    # Check for known failure signatures
     local is_failure=0
-    if [ "$log_size" -lt 1024 ]; then
+    if [ "$exit_code" = "124" ]; then
+        is_failure=1  # timeout
+    elif [ "$exit_code" != "0" ] && [ "$log_size" -lt 1024 ]; then
+        is_failure=1  # non-zero exit with minimal output
+    elif [ "$log_size" -lt 1024 ]; then
         is_failure=1
     elif grep -qE '^\[TIMEOUT\]' "$logfile" 2>/dev/null; then
         is_failure=1
@@ -526,15 +533,20 @@ dispatch_logged() {
         return 0
     fi
 
-    dispatch_agent "$agent" "$prompt_file" "$timeout_secs" "$phase" 2>&1 | tee "$logfile" || true
+    # Capture exit code through the pipe (tee masks it)
+    local rc_file
+    rc_file=$(mktemp "${TMPDIR:-/tmp}/moxie-rc.XXXXXX")
+    ( dispatch_agent "$agent" "$prompt_file" "$timeout_secs" "$phase" 2>&1; echo $? > "$rc_file" ) | tee "$logfile"
+    local dispatch_rc=0
+    [ -f "$rc_file" ] && dispatch_rc=$(cat "$rc_file") && rm -f "$rc_file"
 
     local tokens
     tokens=$(extract_tokens "$logfile" "$agent")
     record_tokens "$csv_file" "$turn" "$agent" "$ts" "$tokens" "$phase"
     echo "  Tokens: $tokens"
 
-    # Track agent health based on output
-    _record_turn_health "$agent" "$logfile" || return $?
+    # Track agent health based on output and exit code
+    _record_turn_health "$agent" "$logfile" "$dispatch_rc" || return $?
 }
 
 # ---- Rewrite agents section of config.toml ----
@@ -612,8 +624,11 @@ if '[settings]' in cleaned:
 else:
     cleaned = cleaned.rstrip() + '\n\n' + agents_block
 
-with open(config_path, 'w') as f:
+tmp_path = config_path + '.tmp'
+with open(tmp_path, 'w') as f:
     f.write(cleaned)
+import os
+os.rename(tmp_path, config_path)
 " "$MOXIE_CONFIG" \
     "$(IFS='|'; echo "${cli_agents[*]}")" \
     "$(IFS='|'; echo "${cli_cmds[*]}")" \
@@ -733,205 +748,59 @@ _cmd_agents_swap() {
         [ -n "$cfg_ep" ] && endpoint="$cfg_ep"
     fi
 
-    # Fetch model catalog
-    printf "Fetching models from AI Gateway..." >&2
-    local models_json=""
-    models_json=$(GATEWAY_API_KEY="$api_key" node "$MOXIE_LIB/gateway-models.mjs" "$endpoint" "" 2>/dev/null) || true
-    printf "\\r\\033[K" >&2
-
-    if [ -z "$models_json" ]; then
-        echo "ERROR: Failed to fetch models. Check your API key or network." >&2
-        return 1
+    # Build current models JSON
+    local current_json="["
+    local first=1
+    if [ ${#current_gw_models[@]} -gt 0 ]; then
+        for cm in "${current_gw_models[@]}"; do
+            [ "$first" = "0" ] && current_json="${current_json},"
+            first=0
+            current_json="${current_json}\"$cm\""
+        done
     fi
+    current_json="${current_json}]"
+
+    # Run the Node.js swap picker
+    local swap_output=""
+    swap_output=$(
+        GATEWAY_API_KEY="$api_key" \
+        GATEWAY_ENDPOINT="$endpoint" \
+        MOXIE_CURRENT_MODELS="$current_json" \
+        node "$MOXIE_LIB/select-gateway.mjs" < /dev/tty 2>/dev/tty
+    ) || {
+        echo "ERROR: Model selection failed." >&2
+        return 1
+    }
 
-    # Parse into arrays
-    local all_model_ids=()
-    local all_model_labels=()
+    # Parse result
+    local cancelled=""
+    local new_gw_names=()
+    local new_gw_models=()
     eval "$(python3 -c "
 import json, sys, shlex
 data = json.loads(sys.stdin.read())
-models = data.get('models', [])
-ids = [m['id'] for m in models]
-labels = [m.get('name', m['id']) for m in models]
-print('all_model_ids=(' + ' '.join(shlex.quote(x) for x in ids) + ')')
-print('all_model_labels=(' + ' '.join(shlex.quote(x) for x in labels) + ')')
-" <<< "$models_json" 2>/dev/null)"
-
-    if [ ${#all_model_ids[@]} -eq 0 ]; then
-        echo "ERROR: No models returned from gateway." >&2
-        return 1
-    fi
-
-    # Pre-select currently configured models
-    local sselected=()
-    for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
-        local _matched=0
-        for cm in "${current_gw_models[@]}"; do
-            if [ "${all_model_ids[$i]}" = "$cm" ]; then
-                _matched=1
-                break
-            fi
-        done
-        sselected+=("$_matched")
-    done
-
-    # Interactive search TUI (same as init picker)
-    local search=""
-    local scursor=0
-    local max_visible=15
-
-    _swap_render() {
-        local filtered=()
-        local lc_search
-        lc_search=$(echo "$search" | tr '[:upper:]' '[:lower:]')
-        for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
-            if [ -z "$search" ]; then
-                filtered+=("$i")
-            else
-                local lc_id
-                lc_id=$(echo "${all_model_ids[$i]}" | tr '[:upper:]' '[:lower:]')
-                [[ "$lc_id" == *"$lc_search"* ]] && filtered+=("$i")
-            fi
-        done
-
-        local fcount=${#filtered[@]}
-        [ "$scursor" -ge "$fcount" ] && scursor=$(( fcount > 0 ? fcount - 1 : 0 ))
-        [ "$scursor" -lt 0 ] && scursor=0
-
-        local vstart=0
-        if [ "$scursor" -ge "$max_visible" ]; then
-            vstart=$(( scursor - max_visible + 1 ))
-        fi
-        local vend=$(( vstart + max_visible ))
-        [ "$vend" -gt "$fcount" ] && vend=$fcount
-
-        local sel_count=0
-        for (( i = 0; i < ${#sselected[@]}; i++ )); do
-            [ "${sselected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
-        done
-
-        printf "\\r\\033[K  \\033[1mSwap gateway models\\033[0m (%d available, %d selected)\\n" "$fcount" "$sel_count" >&2
-        printf "\\r\\033[K  Search: \\033[36m%s\\033[0m\\033[2m|\\033[0m\\n\\n" "$search" >&2
-
-        local rendered=0
-        for (( vi = vstart; vi < vend; vi++ )); do
-            local ri=${filtered[$vi]}
-            local mid="${all_model_ids[$ri]}"
-            local marker="  "
-            [ "$vi" -eq "$scursor" ] && marker="> "
-            local check="[ ]"
-            [ "${sselected[$ri]}" = "1" ] && check="[x]"
-            printf "\\r\\033[K  %s%s %s\\n" "$marker" "$check" "$mid" >&2
-            rendered=$(( rendered + 1 ))
-        done
-
-        while [ "$rendered" -lt "$max_visible" ]; do
-            printf "\\r\\033[K\\n" >&2
-            rendered=$(( rendered + 1 ))
-        done
-
-        if [ "$vstart" -gt 0 ] || [ "$vend" -lt "$fcount" ]; then
-            printf "\\r\\033[K  \\033[2m(%d-%d of %d · scroll for more)\\033[0m\\n" "$(( vstart + 1 ))" "$vend" "$fcount" >&2
-        else
-            printf "\\r\\033[K\\n" >&2
-        fi
-
-        printf "\\r\\033[K  \\033[2m↑↓ navigate · space select · enter confirm · esc cancel · type to filter\\033[0m" >&2
-    }
-
-    local swap_lines=$(( max_visible + 5 ))
-
-    printf "\\033[?25l" >&2
-    local old_stty
-    old_stty=$(stty -g < /dev/tty 2>/dev/null)
-    stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-
-    _swap_cleanup() {
-        printf "\\033[?25h" >&2
-        stty "$old_stty" < /dev/tty 2>/dev/null
-    }
-    trap '_swap_cleanup' INT TERM
-
-    _swap_render
-
-    local swap_done=0
-    local swap_cancelled=0
-    while [ "$swap_done" = "0" ]; do
-        local skey
-        skey=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || break
-
-        if [ "$skey" = $'\033' ]; then
-            local sbracket sdir
-            sbracket=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || true
-            sdir=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || true
-            if [ "$sbracket" = "[" ]; then
-                case "$sdir" in
-                    A) scursor=$(( scursor - 1 )); [ "$scursor" -lt 0 ] && scursor=0 ;;
-                    B) scursor=$(( scursor + 1 )) ;;
-                esac
-            else
-                swap_cancelled=1
-                swap_done=1
-            fi
-        elif [ "$skey" = " " ]; then
-            local ft=()
-            local lcs
-            lcs=$(echo "$search" | tr '[:upper:]' '[:lower:]')
-            for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
-                if [ -z "$search" ]; then
-                    ft+=("$i")
-                else
-                    local lci
-                    lci=$(echo "${all_model_ids[$i]}" | tr '[:upper:]' '[:lower:]')
-                    [[ "$lci" == *"$lcs"* ]] && ft+=("$i")
-                fi
-            done
-            if [ "$scursor" -lt "${#ft[@]}" ]; then
-                local tidx=${ft[$scursor]}
-                [ "${sselected[$tidx]}" = "0" ] && sselected[$tidx]=1 || sselected[$tidx]=0
-            fi
-        elif [ "$skey" = "" ]; then
-            swap_done=1
-        elif [ "$skey" = $'\177' ] || [ "$skey" = $'\010' ]; then
-            if [ -n "$search" ]; then
-                search="${search%?}"
-                scursor=0
-            fi
-        else
-            if [[ "$skey" =~ [[:print:]] ]]; then
-                search="${search}${skey}"
-                scursor=0
-            fi
-        fi
-
-        printf "\\033[%dA" "$swap_lines" >&2
-        _swap_render
-    done
-
-    _swap_cleanup
-    trap - INT TERM
-    printf "\\n\\n" >&2
-
-    if [ "$swap_cancelled" = "1" ]; then
+if data.get('cancelled', False):
+    print('cancelled=1')
+else:
+    print('cancelled=0')
+    names = []
+    models = []
+    for mid in data.get('gateway_models', []):
+        prov = mid.split('/')[0] if '/' in mid else 'unknown'
+        mname = mid.split('/', 1)[1] if '/' in mid else mid
+        slug = (prov + '-' + mname).lower().replace(' ', '-').replace('.', '-')
+        slug = ''.join(c for c in slug if c.isalnum() or c == '-') + '-gw'
+        names.append(slug)
+        models.append(mid)
+    print('new_gw_names=(' + ' '.join(shlex.quote(n) for n in names) + ')')
+    print('new_gw_models=(' + ' '.join(shlex.quote(m) for m in models) + ')')
+" <<< "$swap_output")"
+
+    if [ "$cancelled" = "1" ]; then
         echo "Cancelled — no changes made."
         return 0
     fi
 
-    # Collect selected models
-    local new_gw_names=()
-    local new_gw_models=()
-    for (( i = 0; i < ${#sselected[@]}; i++ )); do
-        [ "${sselected[$i]}" != "1" ] && continue
-        local mid="${all_model_ids[$i]}"
-        local prov="${mid%%/*}"
-        local mname="${mid#*/}"
-        local slug
-        slug=$(echo "${prov}-${mname}" | tr '[:upper:]' '[:lower:]' | tr ' .' '-' | tr -cd 'a-z0-9-')
-        slug="${slug}-gw"
-        new_gw_names+=("$slug")
-        new_gw_models+=("$mid")
-    done
-
     local total_agents=$(( ${#cli_agents[@]} + ${#new_gw_names[@]} ))
     if [ "$total_agents" -lt 2 ]; then
         echo "ERROR: Need at least 2 agents total (${#cli_agents[@]} CLI + ${#new_gw_names[@]} gateway = $total_agents)." >&2

package/lib/gateway-agent.mjs

@@ -27,10 +27,21 @@ if (!MODEL) { process.stderr.write('ERROR: GATEWAY_MODEL not set\n'); process.ex
 const prompt = process.argv[2];
 if (!prompt) { process.stderr.write('ERROR: No prompt provided\n'); process.exit(1); }
 
+// ---- Path safety ----
+
+function safePath(p) {
+  const resolved = resolve(CWD, p);
+  if (resolved !== CWD && !resolved.startsWith(CWD + '/')) {
+    return null;
+  }
+  return resolved;
+}
+
 // ---- Tool implementations ----
 
 function toolReadFile(args) {
-  const filepath = resolve(CWD, args.path);
+  const filepath = safePath(args.path);
+  if (!filepath) return `Error: Path escapes project root: ${args.path}`;
   if (!existsSync(filepath)) return `Error: File not found: ${args.path}`;
   const content = readFileSync(filepath, 'utf8');
   const lines = content.split('\n');
@@ -41,14 +52,16 @@ function toolReadFile(args) {
 }
 
 function toolWriteFile(args) {
-  const filepath = resolve(CWD, args.path);
+  const filepath = safePath(args.path);
+  if (!filepath) return `Error: Path escapes project root: ${args.path}`;
   mkdirSync(dirname(filepath), { recursive: true });
   writeFileSync(filepath, args.content, 'utf8');
   return `Written ${args.content.length} bytes to ${args.path}`;
 }
 
 function toolAppendFile(args) {
-  const filepath = resolve(CWD, args.path);
+  const filepath = safePath(args.path);
+  if (!filepath) return `Error: Path escapes project root: ${args.path}`;
   mkdirSync(dirname(filepath), { recursive: true });
   const existing = existsSync(filepath) ? readFileSync(filepath, 'utf8') : '';
   writeFileSync(filepath, existing + args.content, 'utf8');
@@ -56,7 +69,8 @@ function toolAppendFile(args) {
 }
 
 function toolEditFile(args) {
-  const filepath = resolve(CWD, args.path);
+  const filepath = safePath(args.path);
+  if (!filepath) return `Error: Path escapes project root: ${args.path}`;
   if (!existsSync(filepath)) return `Error: File not found: ${args.path}`;
   const content = readFileSync(filepath, 'utf8');
   const count = content.split(args.old_string).length - 1;
@@ -90,7 +104,8 @@ function toolRunCommand(args) {
 }
 
 function toolListDirectory(args) {
-  const dirpath = resolve(CWD, args.path || '.');
+  const dirpath = safePath(args.path || '.');
+  if (!dirpath) return `Error: Path escapes project root: ${args.path}`;
   if (!existsSync(dirpath)) return `Error: Directory not found: ${args.path}`;
   const entries = readdirSync(dirpath, { withFileTypes: true });
   return entries.map(e => {
@@ -100,7 +115,8 @@ function toolListDirectory(args) {
 }
 
 function toolGlob(args) {
-  const base = resolve(CWD, args.path || '.');
+  const base = safePath(args.path || '.');
+  if (!base) return `Error: Path escapes project root: ${args.path}`;
   const regex = globToRegex(args.pattern);
   const matches = [];
   walkDir(base, base, regex, matches, 0);
@@ -445,6 +461,42 @@ function chatCompletion(messages) {
       res.on('end', () => {
         if (idleTimer) clearTimeout(idleTimer);
 
+        // Process any remaining data in buffer (API may not send trailing newline)
+        if (buffer.trim()) {
+          const trimmed = buffer.trim();
+          if (trimmed.startsWith('data: ')) {
+            const data = trimmed.slice(6);
+            if (data !== '[DONE]') {
+              try {
+                const parsed = JSON.parse(data);
+                if (parsed.usage) usage = parsed.usage;
+                const choice = parsed.choices && parsed.choices[0];
+                if (choice && choice.delta) {
+                  if (choice.delta.content) {
+                    content += choice.delta.content;
+                    process.stdout.write(choice.delta.content);
+                  }
+                  if (choice.delta.tool_calls) {
+                    for (const tc of choice.delta.tool_calls) {
+                      const idx = tc.index;
+                      if (!toolCalls.has(idx)) {
+                        toolCalls.set(idx, { id: tc.id || '', name: '', arguments: '' });
+                      }
+                      const entry = toolCalls.get(idx);
+                      if (tc.id) entry.id = tc.id;
+                      if (tc.function) {
+                        if (tc.function.name) entry.name = tc.function.name;
+                        if (tc.function.arguments) entry.arguments += tc.function.arguments;
+                      }
+                    }
+                  }
+                }
+              } catch { /* malformed final chunk — skip */ }
+            }
+          }
+          buffer = '';
+        }
+
         // Convert Map to sorted array
         const sortedTools = [];
         const indices = Array.from(toolCalls.keys()).sort((a, b) => a - b);