openclacky 1.1.0 → 1.1.2

data/lib/clacky/ui2/progress_handle.rb

@@ -71,7 +71,7 @@ module Clacky
     class ProgressHandle
       # Default tick interval (seconds). Matches the old global spinner
       # cadence. Tests may pass a smaller interval for speed.
-      DEFAULT_TICK_INTERVAL = 0.5
+      DEFAULT_TICK_INTERVAL = 0.25
 
       # Style hint for the renderer. The owner decides what colors to use;
       # the handle only forwards the hint as part of the frame metadata
@@ -93,6 +93,12 @@ module Clacky
       # frame would be visual noise.
       FAST_FINISH_THRESHOLD_SECONDS = 2
 
+      # Show "Thinking for Ns" once the gap since the last LLM stream
+      # chunk reaches this many seconds. Bedrock often pauses 5–18s
+      # while generating large content blocks (long tool_use JSON in
+      # particular); without this hint users assume the agent is stuck.
+      IDLE_HINT_THRESHOLD_SECONDS = 2
+
       # @param owner [#register_progress, #unregister_progress, #render_frame]
       # @param message [String] Initial progress message.
       # @param style [Symbol] :primary or :quiet (see VALID_STYLES).
@@ -122,6 +128,7 @@ module Clacky
         @ticker        = nil
         @state         = :fresh     # :fresh → :running → :closed
         @metadata      = {}
+        @last_chunk_at = nil
         @monitor       = Monitor.new
       end
 
@@ -133,9 +140,10 @@ module Clacky
         @monitor.synchronize do
           return self unless @state == :fresh
 
-          @state      = :running
-          @start_time = @clock.call
-          @entry_id   = @owner.register_progress(self)
+          @state         = :running
+          @start_time    = @clock.call
+          @last_chunk_at = @start_time
+          @entry_id      = @owner.register_progress(self)
         end
 
         # Fire one initial frame synchronously so the user sees the
@@ -156,9 +164,11 @@ module Clacky
         @monitor.synchronize do
           return if @state != :running
           @message  = message.to_s if message
-          @metadata = metadata     if metadata
+          if metadata
+            @metadata = metadata
+            @last_chunk_at = @clock.call
+          end
         end
-        render_now
       end
 
       # Stop the ticker, render one final frame, and unregister from the
@@ -203,7 +213,7 @@ module Clacky
       # +render_frame+ and is responsible for writing it into the entry.
       def current_frame
         @monitor.synchronize do
-          compose_frame(@message, elapsed_seconds, @metadata)
+          compose_frame(@message, elapsed_seconds, @metadata, idle_seconds)
         end
       end
 
@@ -225,6 +235,15 @@ module Clacky
         render_now
       end
 
+      # Like __reattach_entry! but skips the render_now hop. Used by the
+      # owner when it has just painted a frame into the new entry itself
+      # (e.g. while rotating the handle to remain at the buffer tail) and
+      # is still inside its own synchronization — calling render_now there
+      # would re-enter the owner's mutex.
+      def __rebind_entry!(new_entry_id)
+        @monitor.synchronize { @entry_id = new_entry_id }
+      end
+
       # Test hook: force a synchronous render regardless of tick cadence.
       def __force_render!
         render_now
@@ -269,16 +288,68 @@ module Clacky
         (@clock.call - @start_time).to_i
       end
 
-      # Live-frame format: "<message>… (<elapsed>s)"
-      # Metadata like { attempt:, total: } is appended as "[i/N]" when
-      # present, to keep renderer-agnostic callers (e.g. tests) readable.
-      private def compose_frame(message, elapsed, metadata)
-        parts = [message.to_s]
+      # Seconds since the last metadata update (i.e. the last LLM stream
+      # chunk that carried token info). Used to surface "Thinking for Ns"
+      # in the live frame so users can see the agent isn't stuck even
+      # when token counts plateau during long Bedrock content blocks.
+      private def idle_seconds
+        return 0 unless @last_chunk_at
+        (@clock.call - @last_chunk_at).to_i
+      end
+
+      # Live-frame format:
+      #   "<message>… (<elapsed>s · ↓N tokens · reasoning…)"
+      # The "reasoning" tail only appears once tokens have started
+      # streaming AND the gap since the last chunk reaches the threshold
+      # — signalling the model is between tool_use blocks doing extended
+      # thinking. No seconds shown there to avoid duplicating elapsed;
+      # animated dots (1→2→3) provide the "still alive" cue.
+      private def compose_frame(message, elapsed, metadata, idle = 0)
+        head = message.to_s
         if metadata && (attempt = metadata[:attempt]) && (total = metadata[:total])
-          parts << "[#{attempt}/#{total}]"
+          head = "#{head} [#{attempt}/#{total}]"
+        end
+
+        token_part = metadata && format_token_progress(metadata)
+
+        suffix_parts = []
+        suffix_parts << "#{elapsed}s" if elapsed > 0
+        suffix_parts << token_part if token_part
+        if token_part && idle >= IDLE_HINT_THRESHOLD_SECONDS
+          suffix_parts << "reasoning #{spinner_frame} "
+        end
+
+        return "#{head}…" if suffix_parts.empty?
+        "#{head}… (#{suffix_parts.join(" · ")})"
+      end
+
+      SPINNER_FRAMES = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].freeze
+      SPINNER_INTERVAL_MS = 250
+
+      private def spinner_frame
+        ms = (@clock.call.to_f * 1000).to_i
+        SPINNER_FRAMES[(ms / SPINNER_INTERVAL_MS) % SPINNER_FRAMES.length]
+      end
+
+      # Render LLM streaming token counts as "↑1.2k ↓234 tokens".
+      # When input_tokens is unknown (e.g. OpenAI-compat streaming where
+      # prompt_tokens only arrives in the final frame), shows "↑—" so the
+      # column doesn't flicker between absent / present.
+      private def format_token_progress(metadata)
+        output = metadata[:output_tokens]
+        return nil if output.nil? || output.to_i <= 0
+        "↓ #{compact_count(output.to_i)} tokens"
+      end
+
+      private def compact_count(n)
+        return n.to_s if n < 1000
+        if n < 1_000_000
+          k = n / 1000.0
+          k >= 10 ? "#{k.to_i}k" : "%.1fk" % k
+        else
+          m = n / 1_000_000.0
+          m >= 10 ? "#{m.to_i}M" : "%.1fM" % m
         end
-        head = parts.join(" ")
-        elapsed > 0 ? "#{head}… (#{elapsed}s)" : "#{head}…"
       end
 
       # Final frame (used by +finish+). Same as +compose_frame+ but we

data/lib/clacky/ui2/ui_controller.rb

@@ -49,6 +49,7 @@ module Clacky
         @time_machine_callback = nil
         @tasks_count = 0
         @total_cost = 0.0
+        @session_id = nil
         @last_diff_lines = nil
 
         # ── Progress subsystem (v2: owned handles, stacked) ──────────────
@@ -73,6 +74,7 @@ module Clacky
 
         # Set session bar data before initializing screen
         @input_area.update_sessionbar(
+          session_id: @session_id,
           working_dir: @config[:working_dir],
           mode: @config[:mode],
           model: @config[:model],
@@ -109,10 +111,13 @@ module Clacky
       # @param cost_source [Symbol, nil] :api / :price / :default (optional)
       # @param status [String] Workspace status ('idle' or 'working') (optional)
       # @param latency [Hash, nil] Latency metrics; accepted but not displayed in the TUI.
-      def update_sessionbar(tasks: nil, cost: nil, cost_source: nil, status: nil, latency: nil)
+      # @param session_id [String, nil] Full session id; rendered as first 8 chars (parity with WebUI).
+      def update_sessionbar(tasks: nil, cost: nil, cost_source: nil, status: nil, latency: nil, session_id: nil)
         @tasks_count = tasks if tasks
         @total_cost = cost if cost
+        @session_id = session_id if session_id
         @input_area.update_sessionbar(
+          session_id: @session_id,
           working_dir: @config[:working_dir],
           mode: @config[:mode],
           model: @config[:model],
@@ -193,9 +198,35 @@ module Clacky
         @input_area.set_agent(agent, agent_profile)
       end
 
-      # Append output to the output area
-      # @param content [String] Content to append
+      # Append output to the output area.
+      #
+      # If a progress indicator is currently active (somewhere in the
+      # buffer), rotate it to the tail after the append: business content
+      # ends up above, the spinner stays at the bottom. Without this,
+      # every subsequent ticker tick on a non-tail progress entry would
+      # trigger a full output repaint (visible flicker) and the visual
+      # order would have business messages appearing below the spinner.
       def append_output(content)
+        @progress_mutex.synchronize do
+          top = @progress_stack.last
+          if top && top.entry_id
+            @layout.remove_entry(top.entry_id)
+            top.__detach_entry!
+            new_id = @layout.append_output(content)
+            progress_id = @layout.append_output(render_for(top))
+            top.__rebind_entry!(progress_id)
+            new_id
+          else
+            @layout.append_output(content)
+          end
+        end
+      end
+
+      # Internal append that bypasses the progress-rotation logic and the
+      # @progress_mutex. Used by register_progress / unregister_progress,
+      # which already hold the mutex and are themselves placing a fresh
+      # progress entry at the tail.
+      private def append_output_unlocked(content)
         @layout.append_output(content)
       end
 
@@ -481,6 +512,8 @@ module Clacky
 
         # Clear user tip when agent stops working
         @input_area.clear_user_tip
+        # Hide todo area while idle (data preserved, restored on next work)
+        @layout.hide_todos
         @layout.render_input
 
         # Don't show completion message if awaiting user feedback
@@ -597,7 +630,7 @@ module Clacky
           end
 
           @progress_stack.push(handle)
-          entry_id = append_output(render_for(handle))
+          entry_id = append_output_unlocked(render_for(handle))
           recompute_sessionbar_status
           entry_id
         end
@@ -623,7 +656,7 @@ module Clacky
           # Restore the new top, if any: allocate a fresh entry and let it
           # resume rendering from where it left off.
           if (restored = @progress_stack.last)
-            new_id = append_output(render_for(restored))
+            new_id = append_output_unlocked(render_for(restored))
             restored.__reattach_entry!(new_id)
           end
 
@@ -826,6 +859,8 @@ module Clacky
         @last_sessionbar_status = 'idle'
         # Clear user tip when agent stops working
         @input_area.clear_user_tip
+        # Hide todo area while idle (data preserved, restored on next work)
+        @layout.hide_todos
         @layout.render_input
       end
 
@@ -848,6 +883,8 @@ module Clacky
       # Set workspace status to working (called when agent starts working)
       def set_working_status
         update_sessionbar(status: 'working')
+        # Restore todo area if it was hidden during idle
+        @layout.show_todos
         # Show a random user tip with 40% probability when agent starts working
         @input_area.show_user_tip(probability: 0.4)
         @layout.render_input
@@ -1281,6 +1318,7 @@ module Clacky
 
           # Update session bar data (will be rendered by request_confirmation's render_all)
           @input_area.update_sessionbar(
+            session_id: @session_id,
             working_dir: @config[:working_dir],
             mode: @config[:mode],
             model: @config[:model],
@@ -1346,8 +1384,10 @@ module Clacky
           # Add action buttons
           choices << { name: "─" * 50, disabled: true }
           choices << { name: "[+] Add New Model", value: { action: :add } }
-          choices << { name: "[*] Edit Current Model", value: { action: :edit } }
-          choices << { name: "[-] Delete Model", value: { action: :delete } } if current_config.models.length > 1
+          if current_config.models.length > 0
+            choices << { name: "[*] Edit Current Model", value: { action: :edit } }
+            choices << { name: "[-] Delete Model", value: { action: :delete } } if current_config.models.length > 1
+          end
           choices << { name: "[X] Close", value: { action: :close } }
           
           # Show menu

data/lib/clacky/utils/logger.rb

@@ -35,6 +35,13 @@ module Clacky
         @console ||= false
       end
 
+      # Path of the log file currently being written to (today's file).
+      # File may not exist yet if no log has been emitted today — callers
+      # should check File.exist? before reading.
+      def current_log_file
+        log_file_path(Time.now)
+      end
+
       # Log at DEBUG level.
       def debug(message, **context)
         write_log(:debug, message, context)

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/lib/clacky/web/app.css

@@ -943,9 +943,9 @@ body {
   align-self: center;
 }
 .session-item:hover .session-actions-btn { display: flex; }
-.session-actions-btn:hover { 
-  background: var(--color-border-primary); 
-  color: var(--color-text-primary); 
+.session-actions-btn:hover {
+  background: var(--color-border-primary);
+  color: var(--color-text-primary);
 }
 
 /* Pin icon in session name */
@@ -1808,6 +1808,8 @@ body {
 .msg-assistant em { font-style: italic; color: var(--color-text-secondary); }
 .msg-tool      { background: var(--color-bg-primary); border: 1px solid var(--color-border-primary); font-family: monospace; font-size: 12px; color: var(--color-text-secondary); align-self: flex-start; }
 .msg-info      { color: var(--color-text-secondary); font-size: 12px; align-self: center; font-style: italic; }
+.msg-info.msg-info-main { font-style: normal; }
+.msg-info-sub  { color: var(--color-text-secondary); font-size: 11px; align-self: center; opacity: 0.7; margin-top: -27px; }
 
 /* ── Feedback request card ──────────────────────────────────────────────── */
 .feedback-card {
@@ -1926,7 +1928,7 @@ body {
 }
 .msg-success   { color: var(--color-success); align-self: flex-start; font-size: 13px; }
 .tool-name     { color: var(--color-warning); font-weight: 600; }
-.progress-msg  { color: var(--color-accent-primary); font-size: 12px; align-self: center; animation: pulse 1.2s infinite; }
+.progress-msg  { color: var(--color-accent-primary); font-size: 12px; align-self: center; }
 
 /* ── Token usage line ────────────────────────────────────────────────────── */
 .token-usage-line {

data/lib/clacky/web/i18n.js

@@ -37,6 +37,7 @@ const I18n = (() => {
       "chat.status.running": "running",
       "chat.status.error":   "error",
       "chat.input.placeholder": "Message… (Enter to send, Shift+Enter for newline)",
+      "chat.input.placeholderRunning": "AI is working — you can still send extra info anytime...",
       "chat.btn.send":       "Send",
       "chat.thinking":       "Thinking…",
       "chat.retrying":       "Retrying",
@@ -44,6 +45,8 @@ const I18n = (() => {
       "chat.history_start":       "No more history",
       "chat.image_expired": "Expired",
       "chat.done":           "Done — {{n}} iteration(s), {{cost}}",
+      "chat.done.duration":  " · {{duration}}s",
+      "chat.done.cache":     "Cache hit {{rate}}% ({{hits}}/{{total}}) · {{tokens}} tokens reused",
       "chat.interrupted":    "Interrupted.",
       "chat.feedback_hint":  "Or type your own answer below ↓",
       "chat.newMessageHint": "New messages ↓",
@@ -66,11 +69,15 @@ const I18n = (() => {
       "sessions.deleteTitle":   "Delete session",
       "sessions.createError":   "Error: ",
       "sessions.dirNotEmpty":   "Directory already exists and is not empty.",
-      "sessions.export.tooltip": "Download session files (session.json + chunks) for debugging",
+      "sessions.export.tooltip": "Download session files (session.json + chunks + today's log) for debugging",
       "sessions.export.failed":  "Failed to download session",
       "sessions.actions.tooltip":      "Click for session actions",
       "sessions.actions.download":     "Download session files",
       "sessions.actions.downloadHint": "for debugging",
+      "sib.dir.tooltip":         "Click to change directory",
+      "sib.dir.changePrompt":    "Change working directory:",
+      "sib.model.tooltip":       "Click to switch model",
+      "sib.signal.tooltip":      "Recent LLM latency",
       "sessions.thinking":      "Thinking…",
       "sessions.default_name":  "Session {{n}}",
       "sessions.badge.cron":    "Auto",
@@ -449,8 +456,8 @@ const I18n = (() => {
       "settings.brand.label.qrHint":       "Scan with your phone camera",
       "settings.brand.btn.change":         "Change Serial Number",
       "settings.brand.btn.unbind":         "Unbind License",
-      "settings.brand.confirmRebind":      "Warning: all previously installed brand skills will be deleted and cannot be used. Continue?",
-      "settings.brand.confirmUnbind":      "Are you sure you want to unbind this license? All brand skills will be deleted and this device will no longer have access to branded features.",
+      "settings.brand.confirmRebind":      "Enter a new serial number to rebind. If it belongs to the same brand, your installed brand skills are preserved; switching to a different brand will remove them. Continue?",
+      "settings.brand.confirmUnbind":      "Unbind this license? All installed brand skills will be removed, and this device will no longer have access to branded features.",
       "settings.brand.unbindSuccess":      "License unbound successfully.",
       "settings.brand.unbindFailed":       "Failed to unbind license. Please try again.",
       "settings.brand.badge.active":       "Active",
@@ -558,6 +565,7 @@ const I18n = (() => {
       "chat.status.running": "运行中",
       "chat.status.error":   "出错",
       "chat.input.placeholder": "输入消息…（Enter 发送，Shift+Enter 换行）",
+      "chat.input.placeholderRunning": "AI 正在工作，你仍然可以随时补充新信息给它...",
       "chat.btn.send":       "发送",
       "chat.thinking":       "思考中…",
       "chat.retrying":       "正在重试",
@@ -565,6 +573,8 @@ const I18n = (() => {
       "chat.history_start":       "没有更多历史了",
       "chat.image_expired": "已过期",
       "chat.done":           "完成 — {{n}} 步，{{cost}}",
+      "chat.done.duration":  " · {{duration}}s",
+      "chat.done.cache":     "缓存命中 {{rate}}% ({{hits}}/{{total}}) · 复用 {{tokens}} tokens",
       "chat.interrupted":    "已中断。",
       "chat.feedback_hint":  "或在下方输入框自由作答 ↓",
       "chat.newMessageHint": "有新消息 ↓",
@@ -585,11 +595,15 @@ const I18n = (() => {
       "sessions.deleteTitle":   "删除对话",
       "sessions.createError":   "错误：",
       "sessions.dirNotEmpty":   "该目录已存在且不为空，请换一个目录名。",
-      "sessions.export.tooltip": "下载会话文件（session.json + 归档片段），用于调试",
+      "sessions.export.tooltip": "下载会话文件（session.json + 归档片段 + 当天日志），用于调试",
       "sessions.export.failed":  "下载会话文件失败",
       "sessions.actions.tooltip":      "点击查看会话操作",
       "sessions.actions.download":     "下载会话文件",
       "sessions.actions.downloadHint": "用于调试",
+      "sib.dir.tooltip":         "点击切换工作目录",
+      "sib.dir.changePrompt":    "切换工作目录：",
+      "sib.model.tooltip":       "点击切换模型",
+      "sib.signal.tooltip":      "最近一次 LLM 响应延迟",
       "sessions.thinking":      "思考中…",
       "sessions.default_name":  "对话 {{n}}",
       "sessions.badge.cron":    "定时",
@@ -612,6 +626,7 @@ const I18n = (() => {
       "sessions.search.typeCoding":  "Coding",
       "sessions.search.typeSetup":   "配置",
       "sessions.search.datePlaceholder": "日期",
+      "modal.yes": "确定",
       "modal.no":  "取消",
       "modal.ok": "确定",
       "modal.cancel": "取消",
@@ -964,8 +979,8 @@ const I18n = (() => {
       "settings.brand.label.qrHint":       "使用手机扫描二维码",
       "settings.brand.btn.change":         "更换序列号",
       "settings.brand.btn.unbind":         "解绑授权",
-      "settings.brand.confirmRebind":      "警告：所有已安装的历史品牌技能将被删除，无法继续使用。确认继续？",
-      "settings.brand.confirmUnbind":      "确定要解绑此授权吗？所有品牌技能将被删除，本设备将无法再访问品牌功能。",
+      "settings.brand.confirmRebind":      "请输入新序列号以重新绑定。若属于同一品牌，已安装的品牌技能将保留；切换为其他品牌时才会清理。是否继续？",
+      "settings.brand.confirmUnbind":      "确定要解绑此授权吗？所有已安装的品牌技能将被删除，本设备将无法再访问品牌功能。",
       "settings.brand.unbindSuccess":      "授权解绑成功。",
       "settings.brand.unbindFailed":       "解绑授权失败，请重试。",
       "settings.brand.badge.active":       "已激活",

data/lib/clacky/web/index.html

@@ -5,6 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title id="page-title">{{BRAND_NAME}}</title>
   <link rel="icon" type="image/svg+xml" href="/icon.svg">
+  <link rel="stylesheet" href="/vendor/katex/katex.min.css">
   <link rel="stylesheet" href="/app.css">
   <script>
     // Inline theme init — must run before CSS renders to prevent flash of wrong theme.
@@ -300,10 +301,10 @@
           <div id="sib-actions-dropdown" class="sib-actions-dropdown" style="display:none" role="menu"></div>
         </span>
         <span class="sib-sep sib-sep-after-id">│</span>
-        <span id="sib-dir" title="Click to change directory"></span>
+        <span id="sib-dir" data-i18n-title="sib.dir.tooltip" title="Click to change directory"></span>
         <span class="sib-sep sib-sep-after-dir">│</span>
         <span id="sib-model-wrap">
-          <span id="sib-model" class="sib-model-clickable" title="Click to switch model"></span>
+          <span id="sib-model" class="sib-model-clickable" data-i18n-title="sib.model.tooltip" title="Click to switch model"></span>
           <div id="sib-model-dropdown" class="sib-model-dropdown" style="display:none"></div>
         </span>
         <span class="sib-sep sib-sep-after-model">│</span>
@@ -311,7 +312,7 @@
              call completes (see updateInfoBar / Sessions.renderSignalBars). Click
              opens a mini benchmark panel (see Step 3/4 — not yet implemented). -->
         <span id="sib-signal-wrap" style="display:none">
-          <span id="sib-signal" class="sib-signal-clickable" title="Recent LLM latency">
+          <span id="sib-signal" class="sib-signal-clickable" data-i18n-title="sib.signal.tooltip" title="Recent LLM latency">
             <span class="sig-bars" aria-hidden="true"><i></i><i></i><i></i><i></i></span>
             <span class="sig-text"></span>
           </span>
@@ -905,7 +906,6 @@
   <div class="modal-box new-session-modal">
     <div class="modal-header">
       <h3 class="modal-title" data-i18n="sessions.modal.title">Create New Session</h3>
-      <button id="new-session-modal-close" class="modal-close-btn" title="Close">×</button>
     </div>
     <div class="modal-body">
       <div class="modal-field">
@@ -945,8 +945,8 @@
       </div>
     </div>
     <div class="modal-footer">
-      <button id="new-session-create" class="btn-primary" data-i18n="sessions.modal.create">Create Session</button>
       <button id="new-session-cancel" class="btn-secondary" data-i18n="modal.cancel">Cancel</button>
+      <button id="new-session-create" class="btn-primary" data-i18n="sessions.modal.create">Create Session</button>
     </div>
   </div>
 </div>
@@ -968,8 +968,8 @@
     <div id="prompt-modal-message" style="font-size:14px;line-height:1.6;margin-bottom:12px"></div>
     <input type="text" id="prompt-modal-input" class="prompt-modal-input" autocomplete="off" spellcheck="false">
     <div class="modal-actions">
-      <button id="prompt-modal-ok" class="btn-primary" data-i18n="modal.ok">OK</button>
       <button id="prompt-modal-cancel" class="btn-secondary" data-i18n="modal.cancel">Cancel</button>
+      <button id="prompt-modal-ok" class="btn-primary" data-i18n="modal.ok">OK</button>
     </div>
   </div>
 </div>
@@ -997,6 +997,8 @@
 
 
 <script src="/marked.min.js"></script>
+<script src="/vendor/katex/katex.min.js"></script>
+<script src="/vendor/katex/auto-render.min.js"></script>
 <script src="/i18n.js"></script>
 <script src="/auth.js"></script>
 <script src="/theme.js"></script>