chore: CLI v2.1.75–v2.1.80 audit and support (#223–#232) (#233)

## Summary This PR implements all tickets filed from the CLI v2.1.74 → v2.1.80 changelog audit (issues #223–#232). ### Changes by Issue - **#223** — `feat: handle Elicitation and ElicitationResult hook events` New `ElicitationModal.svelte` component, Rust parsing for `[Elicitation Hook]` and `[ElicitationResult Hook]`, new store methods, and TypeScript event types. - **#224** — `feat: handle StopFailure hook event for API error turns` Rust parsing for `[StopFailure Hook]`; frontend shows error toast + error character state. - **#225** — `feat: handle PostCompact hook event` Rust parsing for `[PostCompact Hook]`; frontend shows info toast + success character state. - **#226** — `feat: expose --name CLI flag as session name at startup` Added `session_name` field to `ClaudeStartOptions`; `StatusBar.doConnect()` passes the conversation name. - **#227** — `fix: tighten startup watchdog and correct misleading comment` Startup watchdog tightened from 60 s → 30 s; corrected a comment that said "5 minutes" whilst the code used 60 seconds. - **#228** — `fix: document cost estimation review and update default model fallback` Default model fallback updated from `claude-sonnet-4-5-20250929` → `claude-sonnet-4-6`; added doc comment explaining why char-based estimation is unaffected by v2.1.75 token overcounting fix. - **#229** — `chore: update supported CLI version constant to 2.1.80` `SUPPORTED_CLI_VERSION` bumped in `CliVersion.svelte`. - **#230** — `feat: surface memory file last-modified timestamps in MemoryBrowserPanel` Backend populates `last_modified` Unix timestamp; frontend formats and displays it per file. - **#231** — `feat: update max_output_tokens upper bound and helper text for 128k` Input max raised to 128 000; placeholder and helper text updated to reflect model-dependent defaults and 128 k ceiling for Opus/Sonnet 4.6. - **#232** — `fix: document non-streaming fallback compatibility with mid-session watchdog` Added doc comment above `STUCK_TIMEOUT` explaining the 5-minute watchdog is intentionally larger than the CLI's 2-minute non-streaming API fallback. --- ✨ This PR was created with help from Hikari~ 🌸 Reviewed-on: #233 Co-authored-by: Hikari <hikari@nhcarrigan.com> Co-committed-by: Hikari <hikari@nhcarrigan.com>
2026-03-23 14:28:08 -07:00
parent 8220ab6b85
commit 4134e11c88
21 changed files with 1075 additions and 22 deletions
@@ -2,7 +2,7 @@
  import { invoke } from "@tauri-apps/api/core";
  import { onMount } from "svelte";

-  const SUPPORTED_CLI_VERSION = "2.1.74";
+  const SUPPORTED_CLI_VERSION = "2.1.80";

  let installedVersion = $state("Loading...");
  let latestNpmVersion = $state<string | null>(null);
@@ -610,13 +610,15 @@
          id="max-output-tokens"
          type="number"
          min="1"
-          placeholder="Default (32000)"
+          max="128000"
+          placeholder="Default (model-dependent)"
          bind:value={config.max_output_tokens}
          class="w-full px-3 py-2 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-[var(--text-primary)] placeholder-[var(--text-tertiary)] focus:outline-none focus:border-[var(--accent-primary)]"
        />
        <p class="text-xs text-[var(--text-tertiary)] mt-1">
-          Sets <code class="font-mono">CLAUDE_CODE_MAX_OUTPUT_TOKENS</code> — increase if responses are
-          being cut off mid-reply
+          Sets <code class="font-mono">CLAUDE_CODE_MAX_OUTPUT_TOKENS</code>. Maximum: 128k tokens
+          for Opus 4.6 and Sonnet 4.6 (64k default for Opus 4.6, 32k for other models). Increase if
+          responses are being cut off.
        </p>
      </div>

@@ -0,0 +1,188 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { get } from "svelte/store";
+  import { claudeStore, hasElicitationPending } from "$lib/stores/claude";
+  import { characterState } from "$lib/stores/character";
+  import type { ElicitationEvent } from "$lib/types/messages";
+  import { updateDiscordRpc, setSkipNextGreeting } from "$lib/tauri";
+  import { conversationsStore } from "$lib/stores/conversations";
+  import { configStore } from "$lib/stores/config";
+
+  let isVisible = $state(false);
+  let elicitation: ElicitationEvent | null = $state(null);
+  let response = $state("");
+  let grantedToolsList: string[] = $state([]);
+  let workingDirectory = $state("");
+
+  hasElicitationPending.subscribe((pending) => {
+    isVisible = pending;
+    if (!pending) {
+      response = "";
+    }
+  });
+
+  claudeStore.pendingElicitation.subscribe((e) => {
+    elicitation = e;
+    if (e) {
+      characterState.setState("permission");
+    }
+  });
+
+  claudeStore.grantedTools.subscribe((tools) => {
+    grantedToolsList = Array.from(tools);
+  });
+
+  claudeStore.currentWorkingDirectory.subscribe((dir) => {
+    workingDirectory = dir;
+  });
+
+  async function handleSubmitAndReconnect() {
+    if (!elicitation || !response.trim()) return;
+
+    const conversationId = get(claudeStore.activeConversationId);
+    if (!conversationId) return;
+
+    const responseText = response.trim();
+    const elicitationMessage = elicitation.message;
+    const conversationHistory = claudeStore.getConversationHistory();
+
+    claudeStore.addLine("system", `MCP response submitted. Reconnecting with context...`);
+    claudeStore.clearElicitation();
+
+    try {
+      setSkipNextGreeting(true);
+
+      await invoke("stop_claude", { conversationId });
+
+      await new Promise((resolve) => setTimeout(resolve, 500));
+
+      const config = configStore.getConfig();
+      await invoke("start_claude", {
+        conversationId,
+        options: {
+          working_dir: workingDirectory || "/home/naomi",
+          model: config.model || null,
+          api_key: config.api_key || null,
+          custom_instructions: config.custom_instructions || null,
+          mcp_servers_json: config.mcp_servers_json || null,
+          allowed_tools: grantedToolsList,
+          use_worktree: config.use_worktree ?? false,
+          disable_1m_context: config.disable_1m_context ?? false,
+          include_git_instructions: config.include_git_instructions ?? true,
+          enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
+          auto_memory_directory: config.auto_memory_directory || null,
+          model_overrides: config.model_overrides || null,
+          session_name: null,
+        },
+      });
+
+      const activeConversation = get(conversationsStore.activeConversation);
+      if (activeConversation) {
+        await updateDiscordRpc(
+          activeConversation.name,
+          config.model || "claude",
+          activeConversation.startedAt
+        );
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
+      if (conversationHistory) {
+        const contextMessage = `[CONTEXT RESTORATION]
+I just responded to an MCP server elicitation request. Here's our conversation so far:
+
+${conversationHistory}
+
+The MCP server asked: "${elicitationMessage}"
+My response: "${responseText}"
+
+Please continue where we left off, taking my response into account.`;
+
+        await invoke("send_prompt", {
+          conversationId,
+          message: contextMessage,
+        });
+      }
+
+      characterState.setTemporaryState("success", 2000);
+    } catch (error) {
+      console.error("Failed to reconnect:", error);
+      claudeStore.addLine("error", `Reconnect failed: ${error}`);
+      characterState.setTemporaryState("error", 3000);
+    }
+  }
+
+  function handleDismiss() {
+    claudeStore.clearElicitation();
+    claudeStore.addLine("system", "MCP elicitation dismissed");
+    characterState.setTemporaryState("idle", 1000);
+  }
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (!isVisible || !elicitation) return;
+
+    if (event.key === "Escape") {
+      event.preventDefault();
+      handleDismiss();
+    }
+  }
+
+  function canSubmit(): boolean {
+    return response.trim().length > 0;
+  }
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+{#if isVisible && elicitation}
+  <div
+    class="elicitation-overlay fixed inset-0 bg-black/70 flex items-center justify-center z-50 backdrop-blur-sm"
+  >
+    <div
+      class="elicitation-modal bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl"
+    >
+      <div class="flex items-center gap-3 mb-4">
+        <div class="w-10 h-10 rounded-full bg-blue-500/20 flex items-center justify-center">
+          <span class="text-xl">💬</span>
+        </div>
+        <div>
+          <h2 class="text-lg font-semibold text-[var(--text-primary)]">MCP Server Request</h2>
+          {#if elicitation.server_name}
+            <p class="text-sm text-[var(--text-secondary)]">from: {elicitation.server_name}</p>
+          {:else}
+            <p class="text-sm text-[var(--text-secondary)]">Input required from MCP server</p>
+          {/if}
+        </div>
+      </div>
+
+      <div class="mb-4">
+        <p class="text-[var(--text-primary)]">{elicitation.message}</p>
+      </div>
+
+      <div class="mb-4">
+        <textarea
+          bind:value={response}
+          placeholder="Type your response here..."
+          class="w-full px-4 py-3 bg-[var(--bg-secondary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] placeholder-[var(--text-secondary)] resize-none focus:outline-none focus:border-[var(--accent-primary)]"
+          rows="4"
+        ></textarea>
+      </div>
+
+      <div class="flex gap-3">
+        <button
+          onclick={handleDismiss}
+          class="flex-1 px-4 py-2 bg-gray-500/20 hover:bg-gray-500/30 text-[var(--text-secondary)] rounded-lg transition-colors font-medium"
+        >
+          Dismiss
+        </button>
+        <button
+          onclick={handleSubmitAndReconnect}
+          disabled={!canSubmit()}
+          class="flex-1 px-4 py-2 bg-blue-500/20 hover:bg-blue-500/30 text-blue-400 rounded-lg transition-colors font-medium disabled:opacity-50 disabled:cursor-not-allowed"
+        >
+          Submit & Reconnect
+        </button>
+      </div>
+    </div>
+  </div>
+{/if}
@@ -406,6 +406,7 @@ User: ${formattedMessage}`;
              enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
              auto_memory_directory: config.auto_memory_directory || null,
              model_overrides: config.model_overrides || null,
+              session_name: null,
            },
          });

@@ -14,6 +14,7 @@
  interface MemoryFileInfo {
    path: string;
    heading: string | null;
+    last_modified?: string; // Unix timestamp in seconds as a string, optional for backwards compat
  }

  interface MemoryFilesResponse {
@@ -65,6 +66,16 @@
    return file.heading ?? getFileName(file.path);
  }

+  function formatLastModified(ts: string | undefined): string {
+    if (!ts) return "";
+    const date = new Date(Number(ts) * 1000);
+    return date.toLocaleDateString(undefined, {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    });
+  }
+
  async function sendMemoryCommand() {
    const conversationId = get(claudeStore.activeConversationId);
    if (!conversationId) return;
@@ -205,7 +216,12 @@
                    d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
                  />
                </svg>
-                <span class="file-name">{getDisplayName(file)}</span>
+                <div class="file-info">
+                  <span class="file-name">{getDisplayName(file)}</span>
+                  {#if file.last_modified}
+                    <span class="file-date">{formatLastModified(file.last_modified)}</span>
+                  {/if}
+                </div>
              </button>
            {/each}
          </div>
@@ -416,7 +432,7 @@

  .file-item {
    display: flex;
-    align-items: center;
+    align-items: flex-start;
    gap: 0.75rem;
    padding: 0.75rem 1rem;
    background: var(--bg-secondary);
@@ -445,6 +461,13 @@
    flex-shrink: 0;
  }

+  .file-info {
+    display: flex;
+    flex-direction: column;
+    gap: 0.125rem;
+    overflow: hidden;
+  }
+
  .file-name {
    font-size: 0.875rem;
    font-weight: 500;
@@ -453,6 +476,15 @@
    white-space: nowrap;
  }

+  .file-date {
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+  }
+
+  .file-item.active .file-date {
+    color: rgba(255, 255, 255, 0.75);
+  }
+
  .file-viewer {
    display: flex;
    flex-direction: column;
@@ -93,6 +93,7 @@
          enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
          auto_memory_directory: config.auto_memory_directory || null,
          model_overrides: config.model_overrides || null,
+          session_name: null,
        },
      });

@@ -160,6 +160,7 @@
      if (!conversationId) {
        throw new Error("No active conversation");
      }
+      const activeConversationForName = get(conversationsStore.activeConversation);
      await invoke("start_claude", {
        conversationId,
        options: {
@@ -177,6 +178,7 @@
          enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
          auto_memory_directory: currentConfig.auto_memory_directory || null,
          model_overrides: currentConfig.model_overrides || null,
+          session_name: activeConversationForName?.name || null,
        },
      });

@@ -338,6 +340,7 @@
          enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
          auto_memory_directory: currentConfig.auto_memory_directory || null,
          model_overrides: currentConfig.model_overrides || null,
+          session_name: null,
        },
      });

@@ -222,6 +222,7 @@
          enable_claudeai_mcp_servers: cfg.enable_claudeai_mcp_servers ?? true,
          auto_memory_directory: cfg.auto_memory_directory || null,
          model_overrides: cfg.model_overrides || null,
+          session_name: null,
        },
      });
    } catch (error) {
@@ -112,6 +112,7 @@
          enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
          auto_memory_directory: config.auto_memory_directory || null,
          model_overrides: config.model_overrides || null,
+          session_name: null,
        },
      });