samagotchi 0.3.0 → 0.4.0

data/lib/samagotchi/web/public/diff_view.js

@@ -0,0 +1,58 @@
+// What chi's edit/write tools change, as HTML, apart from the DOM. One
+// renderer for both places: the approval card (the dry run, which can also
+// say the edit would fail, or that the file isn't shown) and a tool row's
+// collapsed "diff +3 −1" (what the call really changed). A diff is the
+// server's {text, added, removed, truncated, new_file} (EditPreview).
+
+import { escapeHtml } from "./format.js";
+
+// More lines than this fold behind a "show all N lines" toggle.
+export const DIFF_FOLD_LINES = 20;
+
+const MINUS = "−";
+
+// "+3 −1"
+export function diffCounts(diff) {
+  return `+${Number(diff?.added) || 0} ${MINUS}${Number(diff?.removed) || 0}`;
+}
+
+// A row's summary line: "diff +3 −1", "new file +12".
+export function diffSummary(diff) {
+  return diff?.new_file ? `new file +${Number(diff.added) || 0}` : `diff ${diffCounts(diff)}`;
+}
+
+export function diffLineClass(line) {
+  if (line.startsWith("@@")) return "hunk";
+  if (line.startsWith("+")) return "add";
+  if (line.startsWith("-")) return "del";
+  if (line.startsWith("\\") || line.startsWith("… ")) return "meta";
+  return "ctx";
+}
+
+function linesHtml(lines) {
+  return lines.map((line) => `<span class="diff-line diff-${diffLineClass(line)}">${escapeHtml(line) || " "}</span>`).join("");
+}
+
+// @param diff an EditPreview: a diff, or {error} / {skipped}
+// @return {string} HTML; "" for none
+export function diffHtml(diff, { fold = DIFF_FOLD_LINES } = {}) {
+  if (!diff || typeof diff !== "object") return "";
+  if (diff.error) return `<div class="diff-note warn">this edit would fail: ${escapeHtml(diff.error)}</div>`;
+  if (diff.skipped) return `<div class="diff-note">diff not shown: ${escapeHtml(diff.skipped)}</div>`;
+  const text = String(diff.text ?? "");
+  if (!text) return `<div class="diff-note">no change</div>`;
+  const lines = text.split("\n");
+  const head = diff.new_file ? `<div class="diff-note">new file</div>` : "";
+  const shown = `<pre class="diff"><code>${linesHtml(lines.slice(0, fold))}</code></pre>`;
+  if (lines.length <= fold) return head + shown;
+  // The rest opens under the first lines; the toggle hides once open (CSS).
+  const rest = `<details class="diff-more"><summary>show all ${lines.length} lines</summary>` +
+    `<pre class="diff"><code>${linesHtml(lines.slice(fold))}</code></pre></details>`;
+  return head + shown + rest;
+}
+
+// A tool row's collapsed diff (closed by default).
+export function activityDiffHtml(diff) {
+  if (!diff || typeof diff !== "object" || diff.error || diff.skipped) return "";
+  return `<details class="activity-diff"><summary>${escapeHtml(diffSummary(diff))}</summary>${diffHtml(diff)}</details>`;
+}

data/lib/samagotchi/web/public/index.html

@@ -6,7 +6,8 @@
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <style>
 :root{--bg:#0b0d11;--bg-panel:#151821;--bg-inset:#0f1115;--bg-raised:#22262f;--bg-hover:#1b1f27;--border:#1f232b;--border-strong:#2d333f;--text:#e6e8eb;--text-bright:#f0f3f6;--text-2:#c9d1d9;--text-3:#9aa4b2;--text-muted:#8b949e;--text-faint:#6e7681;--accent:#7aa5ff;--accent-strong:#1f6feb;--accent-bg:#1b2336;--accent-ring:rgba(122,165,255,.18);--primary:#2a68d1;--ok:#3fb950;--ok-text:#7ee787;--ok-bg:#1a2e1a;--warn:#d29922;--warn-text:#e3b341;--warn-bright:#f2cc60;--warn-bg:#2b2108;--warn-border:#6b5416;--danger:#f85149;--danger-bg:#da3633;--danger-text:#ff7b72;--danger-bg-dim:#3d1f1f;--think:#8957e5;--think-text:#d2a8ff;--accent-border:#223150;--accent-tint:color-mix(in srgb,var(--accent) 7%,transparent);
-  --glass-bg:color-mix(in srgb,var(--bg-panel) 70%,transparent);--glass-border:rgba(255,255,255,.08);--glass-highlight:rgba(255,255,255,.05);--glass-shadow:0 8px 30px rgba(0,0,0,.35)}
+  --glass-bg:color-mix(in srgb,var(--bg-panel) 70%,transparent);--glass-border:rgba(255,255,255,.08);--glass-highlight:rgba(255,255,255,.05);--glass-shadow:0 8px 30px rgba(0,0,0,.35);
+  --diff-add-bg:rgba(63,185,80,.14);--diff-add-text:#aff5b4;--diff-del-bg:rgba(248,81,73,.14);--diff-del-text:#ffc1bc}
 *{box-sizing:border-box;margin:0;padding:0}
 body{font-family: ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif;background:radial-gradient(1100px 700px at 8% 0%,color-mix(in srgb,var(--accent) 13%,transparent),transparent 70%),radial-gradient(900px 700px at 100% 100%,color-mix(in srgb,var(--think) 9%,transparent),transparent 70%),var(--bg);background-attachment:fixed;color:var(--text);height:100vh;display:flex;flex-direction:column}
 /* Glass: the composer card, the strip cards, the all-sessions cards and the question cards (by selector, so app.js is untouched). */
@@ -130,9 +131,15 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .activity-status,.activity-tool{flex-shrink:0;white-space:nowrap}
 .activity-params{min-width:0}
 .activity-output{flex:1 1 100%;min-width:0}
+/* An edit/write's change: a closed "diff +3 −1" under the output, lined up with it. */
+.activity-diff{flex:1 1 100%;min-width:0;margin:2px 0 2px 60px}
+.activity-diff>summary{cursor:pointer;font-size:12px;color:var(--text-muted);width:max-content;font-variant-numeric:tabular-nums}
+.activity-diff>summary:hover{color:var(--text-2)}
+.activity-diff[open]>summary{margin-bottom:4px}
 @media(max-width:600px){
   .activity-params{flex:1 1 0}
   .activity-output{margin-left:0}
+  .activity-diff{margin-left:0}
 }
 .bubble.thinking{border-left:3px solid var(--think);background:color-mix(in srgb,var(--think) 6%,var(--bg-panel));padding:8px 12px}
 .bubble.thinking:not([open]),.bubble.activity:not([open]){padding:3px 10px;background:transparent;border-color:transparent;align-self:flex-start;border-radius:6px;transition:background .12s ease}
@@ -253,6 +260,20 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .approval-where,.approval-why{font-size:12px;color:var(--text-muted);word-break:break-all}
 .approval-why{color:var(--warn-text)}
 .approval-label{color:var(--text-faint)}
+/* A diff (diff_view.js): the approval card's dry run and a tool row's change. */
+.approval-diff{margin:0 0 6px}
+.diff{margin:0;padding:4px 0;background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;font-size:12px;line-height:1.45;overflow:auto;max-height:420px}
+.diff code{display:block;min-width:max-content}
+.diff-line{display:block;padding:0 10px;white-space:pre;color:var(--text-2)}
+.diff-add{background:var(--diff-add-bg);color:var(--diff-add-text)}
+.diff-del{background:var(--diff-del-bg);color:var(--diff-del-text)}
+.diff-hunk{color:var(--text-faint)}
+.diff-meta{color:var(--text-faint);font-style:italic}
+.diff-note{font-size:12px;color:var(--text-muted);margin:0 0 4px}
+.diff-note.warn{color:var(--warn-text)}
+.diff-more{margin-top:4px}
+.diff-more>summary{cursor:pointer;font-size:12px;color:var(--accent);width:max-content}
+.diff-more[open]>summary{display:none}
 .bubble.guardrail-warning{border-left:3px solid var(--danger);background:color-mix(in srgb,var(--danger) 8%,var(--bg-panel));color:var(--danger-text);font-size:13px;padding:8px 12px;white-space:pre-wrap}
 .bubble.hook-notice{border-left:3px solid var(--text-faint);background:var(--bg-panel);color:var(--text-3);font-size:13px;padding:8px 12px;white-space:pre-wrap}
 .bubble.hook-notice.warn{border-left-color:var(--warn);color:var(--warn-text)}

data/lib/samagotchi/web/public/question_card.js

@@ -8,7 +8,8 @@ export function isApproval(pq) {
   return !!pq && pq.kind === "approval";
 }
 
-// @return {null | {tool, what, isCommand, where, why}}
+// @return {null | {tool, what, isCommand, where, why, preview?}}; preview is
+// an edit/write's dry-run diff (diff_view.js draws it)
 export function approvalView(pq) {
   if (!isApproval(pq)) return null;
   const a = pq.approval || {};
@@ -31,6 +32,7 @@ export function approvalView(pq) {
     isCommand: !!command,
     where,
     why: `${reason} (${who})`,
+    ...(a.preview && typeof a.preview === "object" ? { preview: a.preview } : {}),
   };
 }
 

data/lib/samagotchi/web/public/turn_events.js

@@ -45,10 +45,14 @@ export function reminderText(event) {
 }
 
 // Who a hook's notice is from: the bundle's name for a bundle hook
-// ("known_names.rb (bundle known-names)"), else "hook".
+// ("known_names.rb (bundle known-names)"), chi's own notice by its word
+// (thinking), else "hook".
 export function hookNoticeLabel(hook) {
-  const m = /\(bundle (.+)\)$/.exec(String(hook || ""));
-  return m ? m[1] : "hook";
+  const name = String(hook || "");
+  const m = /\(bundle (.+)\)$/.exec(name);
+  if (m) return m[1];
+  // chi's own notices name themselves with a bare word (thinking).
+  return /^[a-z][a-z0-9-]*$/.test(name) ? name : "hook";
 }
 
 // The row a step gets when the loop asks again after an empty answer.
@@ -56,6 +60,23 @@ export function emptyRetryLine({ attempt, of } = {}) {
   return `↻ empty answer, asking again (${attempt}/${of})`;
 }
 
+// The live turn's status while the provider is asked again after an error
+// (generation_retrying): "↻ retrying (503) in 4 s, 2/5" (retry 2 of 5).
+export function retryStatusLine({ attempt, max_retries, next_delay, status, error_class } = {}) {
+  const why = status || String(error_class || "").split("::").pop();
+  const delay = Number(next_delay);
+  const when = Number.isFinite(delay) ? ` in ${delay < 1 ? delay.toFixed(1) : Math.round(delay)} s` : "";
+  const count = attempt ? `, ${attempt}${max_retries ? `/${max_retries}` : ""}` : "";
+  return `↻ retrying${why ? ` (${why})` : ""}${when}${count}`;
+}
+
+// The live turn's status while it waits for plugins' slow setup before its
+// first request (plugin_init_wait).
+export function initWaitLine({ tasks } = {}) {
+  const labels = (tasks || []).map((t) => [t?.bundle, t?.label].filter(Boolean).join(": ")).filter(Boolean);
+  return `waiting for ${labels.length ? labels.join(" · ") : "plugins"}…`;
+}
+
 // A composer line for the worker's command route rather than a prompt.
 export function isCommandLine(text) {
   return /^[/!]/.test(String(text || "").trim());
@@ -67,6 +88,7 @@ export function isCommandLine(text) {
 const WEB_LOCAL_REPLIES = {
   "/archive": "/archive: use the archive button in the session bar",
   "/exit": "/exit: close the tab to leave; stop in the session bar stops the worker",
+  "/quit": "/quit: close the tab to leave; stop in the session bar stops the worker",
 };
 
 export function webLocalReply(text) {
@@ -213,10 +235,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
           if (part.label) call.label = part.label;
           events.push({ type: "tool_call_started", ...call, params: part.params });
           if (part.status !== "running") {
-            events.push(withImages({
+            const completed = {
               type: "tool_call_completed", ...call, output: part.output, output_truncated: !!part.output_truncated,
               activity: { status: part.status, params: part.params },
-            }, part.images));
+            };
+            if (part.diff) completed.diff = part.diff;
+            events.push(withImages(completed, part.images));
           }
           break;
         }

data/lib/samagotchi/web/public/turn_view.js

@@ -13,6 +13,7 @@ import { toolName } from "./activity.js";
 import { leavesBlock } from "./card.js";
 import { activityStatusClass, activityStatusLabel, fillActivityRow } from "./chat_view.js";
 import { copySourceAttr } from "./copy.js";
+import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
 import { shouldFollowScroll } from "./scroll.js";
 import { hookNoticeLabel } from "./turn_events.js";
@@ -562,7 +563,7 @@ function reloadRowHtml(r, thumbs) {
     : "";
   return `<div class="activity-row" data-key="${escapeHtml(r.key)}"><span class="activity-status ${activityStatusClass(r.status)}">${activityStatusLabel(r.status)}</span>` +
     `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}${output}` +
-    `${r.images?.length ? thumbs(r.images) : ""}</div>`;
+    `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
 
 // A reloaded history in the turn view (renderHistory's object path): per

data/lib/samagotchi/worker.rb

@@ -318,6 +318,7 @@ module Samagotchi
       @engine.clear_due_reminder_names!
       return false unless @engine.reminders_due?
 
+      drop_continue_offer({ client_id: SessionManager::REMINDER_CLIENT_ID })
       @session.status = Session::STATUS_RUNNING
       @session.save(state_dir: @state_dir)
       begin
@@ -331,8 +332,8 @@ module Samagotchi
       ensure
         refuse_queued_commands
       end
-      # A pending continue offer stays (the REPL rule); otherwise the
-      # rollback window closes.
+      # The offer went before the turn (drop_continue_offer); the rollback
+      # window closes.
       @turn_flow.after_reminder_turn
       @session.save(state_dir: @state_dir) unless stopped_on_disk?
       true
@@ -476,8 +477,8 @@ module Samagotchi
       @engine.announce(type: :continue_offered, context: offer[:context], no_interrupt: offer[:no_interrupt])
     end
 
-    # A prompt taken while a continue is offered replaces the answer (D2):
-    # the offer goes, the partial turn stays.
+    # A prompt (or a reminder turn) taken while a continue is offered
+    # replaces the answer (D2): the offer goes, the partial turn stays.
     def drop_continue_offer(origin)
       return unless @turn_flow.awaiting_continue?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -177,11 +177,14 @@ files:
 - lib/samagotchi/desktop/macos/App.swift
 - lib/samagotchi/desktop/macos/ChiRunner.swift
 - lib/samagotchi/desktop/macos/Hotkey.swift
+- lib/samagotchi/desktop/macos/Images.swift
 - lib/samagotchi/desktop/macos/Info.plist.erb
 - lib/samagotchi/desktop/macos/Panel.swift
 - lib/samagotchi/desktop_command.rb
+- lib/samagotchi/edit_preview.rb
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
+- lib/samagotchi/gem_update.rb
 - lib/samagotchi/guardrails.rb
 - lib/samagotchi/guardrails/approval.rb
 - lib/samagotchi/guardrails/approvals.rb
@@ -206,6 +209,8 @@ files:
 - lib/samagotchi/installed_gem.rb
 - lib/samagotchi/kernel_loop.rb
 - lib/samagotchi/launch_mode.rb
+- lib/samagotchi/live_versions.rb
+- lib/samagotchi/llm/api_key.rb
 - lib/samagotchi/llm/backend.rb
 - lib/samagotchi/llm/chat_loop.rb
 - lib/samagotchi/llm/errors.rb
@@ -228,6 +233,7 @@ files:
 - lib/samagotchi/memory_bundle/merger.rb
 - lib/samagotchi/memory_bundle/placeholder.rb
 - lib/samagotchi/memory_bundle/provenance.rb
+- lib/samagotchi/memory_bundle/shipped_update.rb
 - lib/samagotchi/memory_bundle/source.rb
 - lib/samagotchi/memory_bundle/status.rb
 - lib/samagotchi/memory_bundle/system_bundle.rb
@@ -284,6 +290,8 @@ files:
 - lib/samagotchi/terminal_ui/screen.rb
 - lib/samagotchi/terminal_ui/surface.rb
 - lib/samagotchi/terminal_ui/thinking_line.rb
+- lib/samagotchi/text_diff.rb
+- lib/samagotchi/thinking.rb
 - lib/samagotchi/thinking_ticker.rb
 - lib/samagotchi/thought_stream_splitter.rb
 - lib/samagotchi/token_usage.rb
@@ -321,6 +329,8 @@ files:
 - lib/samagotchi/turn_flow.rb
 - lib/samagotchi/turn_note.rb
 - lib/samagotchi/turn_tally.rb
+- lib/samagotchi/update_command.rb
+- lib/samagotchi/update_hint.rb
 - lib/samagotchi/version.rb
 - lib/samagotchi/vision_context.rb
 - lib/samagotchi/vision_support.rb
@@ -339,6 +349,7 @@ files:
 - lib/samagotchi/web/public/copy.js
 - lib/samagotchi/web/public/ctx.js
 - lib/samagotchi/web/public/data.js
+- lib/samagotchi/web/public/diff_view.js
 - lib/samagotchi/web/public/format.js
 - lib/samagotchi/web/public/hold.js
 - lib/samagotchi/web/public/images.js