switchroom 0.18.28 → 0.18.29

package/telegram-plugin/tests/turn-flush-safety.test.ts

@@ -629,6 +629,40 @@ describe('selectFlushDeliveryText — deliver the terminal answer, strip only na
     expect(selectFlushDeliveryText([])).toBe('')
   })
 
+  // #3276 guard 8 — the NARRATION_OPENER regex alone misses progress narration
+  // that does NOT open with "Let me…/I'll…" but trails off into an ellipsis or
+  // colon ("Checking now…"). Pre-fix, `isNarrationBlock` returned false for it,
+  // so the whole `narration\n\nanswer` blob was delivered. FAILS pre-fix.
+  it('strips a non-opener progress narration ("Checking now…") that precedes the answer', () => {
+    const out = selectFlushDeliveryText(['Checking now…', 'The build is green.'])
+    expect(out).toBe('The build is green.')
+    expect(out).not.toContain('Checking now')
+  })
+
+  it('strips a colon-terminated progress narration ("Pulling the numbers:")', () => {
+    const out = selectFlushDeliveryText(['Pulling the numbers:', 'Revenue was 4.2M.'])
+    expect(out).toBe('Revenue was 4.2M.')
+  })
+
+  it('still delivers a SHORT terminal answer after progress narration (no min-char re-gate)', () => {
+    // "yes, done" is well under FLUSH_SUBSTANTIVE_MIN_CHARS and MUST still deliver.
+    const out = selectFlushDeliveryText(['Looking into that...', 'yes, done'])
+    expect(out).toBe('yes, done')
+  })
+
+  // #3276 finding 7 — the narration heuristic only ever strips PRECEDING blocks;
+  // the terminal answer block is always preserved. A colon-terminated line that
+  // IS the whole answer (e.g. a lead-in the model never continued) must NOT be
+  // dropped, whether it stands alone or is the terminal block after narration.
+  it('never drops a colon-terminated line that IS the whole answer (single block)', () => {
+    expect(selectFlushDeliveryText(['Here are the results:'])).toBe('Here are the results:')
+  })
+
+  it('keeps a colon-terminated TERMINAL block (it is the answer, not narration)', () => {
+    const out = selectFlushDeliveryText(['Checking now…', 'Here are the results:'])
+    expect(out).toBe('Here are the results:')
+  })
+
   it('decideTurnFlush delivers the narrowed answer, not the whole blob', () => {
     const decision = decideTurnFlush({
       chatId: 'chat1',

package/telegram-plugin/tier-downgrade.ts

@@ -20,9 +20,10 @@
  * account-swap, never by a downgrade.
  *
  * There is NO automatic return to the premium model. The `/model` override is
- * SESSION-SCOPED and in-memory only (`recordTypedModelSwitch` writes NO carrier
- * — reference/rfcs/session-model-stickiness.md §0.1 rev 4), so it dies on the
- * downgrade SIGTERM. The downgrade writes a consume-once `.session-model`
+ * SESSION-SCOPED: rev 5 (reference/rfcs/session-model-stickiness.md §0.05) makes
+ * every switch a consume-once `.session-model` carrier relaunch, so the override
+ * dies on the downgrade SIGTERM (the carrier was consumed on its own apply-boot).
+ * The downgrade writes a consume-once `.session-model`
  * carrier for the CONFIGURED DEFAULT: start.sh applies+deletes it on the resume
  * boot, and every subsequent restart boots the configured default too. The
  * premium model is never restored on its own — the user must re-issue

package/telegram-plugin/turn-flush-safety.ts

@@ -193,8 +193,32 @@ export function selectFlushDeliveryText(blocks: string[]): string {
 const NARRATION_OPENER =
   /^(let me\b|lemme\b|i'?ll\b|i will\b|i am going to\b|i'?m going to\b|i'?m about to\b|going to\b|first,?\s+(?:let me|i'?ll|i will)\b|now,?\s+(?:let me|i'?ll|i will)\b|next,?\s+(?:let me|i'?ll|i will)\b|let'?s\b)/i
 
+/**
+ * #3276 guard 8 — the `NARRATION_OPENER` regex alone misses common progress
+ * narration that opens with a gerund/present-continuous verb and trails off
+ * into an ellipsis or colon: "Checking now…", "Pulling the numbers:",
+ * "Looking into that…". Relying on the opener regex leaked those blocks into
+ * the delivered answer. This recognises a NON-terminal narration line
+ * deterministically, WITHOUT re-gating on a min-char floor (a short real
+ * answer like "Yes, done." must still deliver): a single short line that ends
+ * with an ellipsis or a colon is progress narration, not the terminal answer.
+ *
+ * Kept conservative on purpose — only a SINGLE-line block (no internal
+ * paragraph) under the substantive floor, ending in `…` / `...` / `:`, so a
+ * genuine multi-paragraph answer that happens to end a paragraph with a colon
+ * is never mistaken for narration.
+ */
+const NARRATION_TRAILER = /(?:\.{3}|…|:)\s*$/
+
+function isTrailingNarrationLine(block: string): boolean {
+  const t = block.trim()
+  if (t.length === 0 || t.length >= FLUSH_SUBSTANTIVE_MIN_CHARS) return false
+  if (t.includes('\n')) return false
+  return NARRATION_TRAILER.test(t)
+}
+
 function isNarrationBlock(block: string): boolean {
-  return NARRATION_OPENER.test(block.trimStart())
+  return NARRATION_OPENER.test(block.trimStart()) || isTrailingNarrationLine(block)
 }
 
 export type FlushDecision =

package/vendor/hindsight-memory/scripts/lib/content.py

@@ -8,8 +8,14 @@ truncateRecallQuery, sliceLastTurnsByUserBoundary, prepareRetentionTranscript,
 formatMemories.
 """
 
+import os
 import re
-from datetime import datetime, timezone
+from datetime import datetime
+
+try:  # Python 3.9+; present in every switchroom agent image.
+    from zoneinfo import ZoneInfo
+except ImportError:  # pragma: no cover - defensive only
+    ZoneInfo = None  # type: ignore[assignment,misc]
 
 # ---------------------------------------------------------------------------
 # Memory tag stripping (anti-feedback-loop)
@@ -254,16 +260,44 @@ def format_memories(results: list) -> str:
     return "\n\n".join(lines)
 
 
+def _resolve_agent_timezone() -> str:
+    """Resolve the agent's configured IANA timezone.
+
+    Mirrors the switchroom cascade used by ``bin/timezone-hook.sh`` and
+    ``src/config/timezone.ts``: ``SWITCHROOM_TIMEZONE`` → ``TZ`` → ``UTC``.
+    This recall hook runs as a plugin subprocess INSIDE the agent container,
+    so it inherits both env vars (compose.ts bakes them onto the container).
+    """
+    return os.environ.get("SWITCHROOM_TIMEZONE") or os.environ.get("TZ") or "UTC"
+
+
 def format_current_time() -> str:
-    """Format current UTC time for recall context.
+    """Format the current time in the agent's LOCAL timezone for recall context.
 
-    The "UTC" suffix is explicit so client LLMs do not misread the
-    value as local time when reasoning about wall-clock context.
+    Switchroom #tz-fix: previously this emitted ``"%Y-%m-%d %H:%M UTC"``, the
+    STRONGEST of several competing UTC "current time" strings the model saw
+    each turn — it fought the single correct local-time hint and made agents
+    intermittently report UTC / wrong-offset times. We now render the agent's
+    LOCAL wall clock in am/pm form (e.g. ``2026-07-16 04:09 PM AEST``) so the
+    recall block never injects a UTC "now". Deterministic — the timezone comes
+    from the container env, not model discipline.
 
     Port of: formatCurrentTimeForRecall() in index.js
     """
-    now = datetime.now(timezone.utc)
-    return now.strftime("%Y-%m-%d %H:%M UTC")
+    tz_name = _resolve_agent_timezone()
+    now = None
+    if ZoneInfo is not None:
+        try:
+            now = datetime.now(ZoneInfo(tz_name))
+        except Exception:  # unknown/invalid zone — degrade, don't crash recall.
+            now = None
+    if now is None:
+        # No zoneinfo or bad zone: fall back to the process-local clock, which
+        # already honours the container's TZ env via libc. am/pm form, no "UTC".
+        now = datetime.now().astimezone()
+    # "%Y-%m-%d %I:%M %p %Z" → e.g. "2026-07-16 04:09 PM AEST" (mirrors the
+    # %I:%M %p %Z tail of bin/timezone-hook.sh's format).
+    return now.strftime("%Y-%m-%d %I:%M %p %Z")
 
 
 # ---------------------------------------------------------------------------

package/vendor/hindsight-memory/tests/test_content.py

@@ -585,10 +585,31 @@ class TestPrepareRetentionTranscript:
 
 
 class TestFormatCurrentTime:
-    def test_includes_utc_suffix(self):
-        # The "UTC" suffix prevents client LLMs from misreading the
-        # timestamp as local time.
-        assert format_current_time().endswith(" UTC")
-
-    def test_format_shape(self):
-        assert re.fullmatch(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2} UTC", format_current_time())
+    # switchroom #tz-fix: recall's "Current time - …" line now renders the
+    # agent's LOCAL wall clock in am/pm, NOT UTC — it was the strongest of
+    # several competing UTC "now" strings the model saw each turn.
+    def test_local_am_pm_shape(self, monkeypatch):
+        # A real IANA zone → am/pm form with the zone abbreviation, no "UTC".
+        monkeypatch.setenv("SWITCHROOM_TIMEZONE", "Australia/Melbourne")
+        monkeypatch.delenv("TZ", raising=False)
+        out = format_current_time()
+        # e.g. "2026-07-16 04:09 PM AEST" / "… AEDT" (DST) — abbrev is 3-5 alpha.
+        assert re.fullmatch(
+            r"\d{4}-\d{2}-\d{2} \d{2}:\d{2} (?:AM|PM) [A-Za-z]{2,5}", out
+        ), out
+
+    def test_never_emits_utc_current_time(self, monkeypatch):
+        # The whole point of the fix: no UTC "current time" for a real zone.
+        monkeypatch.setenv("SWITCHROOM_TIMEZONE", "Australia/Melbourne")
+        monkeypatch.delenv("TZ", raising=False)
+        out = format_current_time()
+        assert "UTC" not in out
+        assert not out.endswith("Z")
+
+    def test_am_pm_when_no_zone_configured(self, monkeypatch):
+        # No SWITCHROOM_TIMEZONE / TZ → still am/pm shape (process-local clock),
+        # never the old "%Y-%m-%d %H:%M UTC" 24h form.
+        monkeypatch.delenv("SWITCHROOM_TIMEZONE", raising=False)
+        monkeypatch.delenv("TZ", raising=False)
+        out = format_current_time()
+        assert re.match(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2} (?:AM|PM)", out), out