throughline 0.3.4 → 0.3.6

package/README.md

@@ -181,11 +181,14 @@ Example output (real values from a running 1M-context Opus session):
 - **Resize resilient.** Column width is polled every second, so pane drags that
   don't fire a terminal `resize` event (common in VS Code's integrated
   terminal) still trigger a full redraw.
-- **Per-row "last updated" stamp.** Each session row ends with `(24m ago)` so
-  you can tell a frozen display apart from an idle session at a glance. When
-  you need more detail, `throughline doctor --session <id-prefix>` compares the
-  state file against the actual transcript JSONL and flags drift, idle time,
-  and `/clear`-induced transcript path staleness.
+- **Per-row "last updated" stamp.** Each session row carries an 8-cell
+  `just now` / `24m ago` stamp right after the session id, placed before the
+  bar so narrow terminals don't truncate it. It resets to `just now` on every
+  Stop hook, so a growing stamp means the session is truly idle — not the
+  monitor stuck. When you need more detail,
+  `throughline doctor --session <id-prefix>` compares the state file against
+  the actual transcript JSONL and flags drift, idle time, and
+  `/clear`-induced transcript path staleness.
 - **State-backed usage snapshot.** When the Stop hook finishes a turn it
   persists the latest `tokens / model / contextWindowSize` back into the state
   file. The monitor prefers this snapshot over re-reading the JSONL, which
@@ -379,6 +382,13 @@ No session has touched its state file in the last 15 minutes. Send a message in
 Claude Code and the monitor should pick it up within 1 second. If it still does
 not, run `throughline doctor`.
 
+**Monitor seems stuck on the same value**
+Each session row ends with a `(Nm ago)` stamp. If it keeps growing, the session
+is idle — no assistant turn has finished. For a deeper look, run
+`throughline doctor --session <id-prefix>` to compare the state file against
+the actual transcript JSONL and flag drift, idle time, or `/clear`-induced
+transcript path staleness.
+
 **`throughline install` wrote to the wrong settings file**
 By default, Throughline installs to `~/.claude/settings.json` (user scope, applies
 to all projects). Use `--project` to scope it to the current directory's
@@ -430,13 +440,18 @@ the folder in VS Code.
 
 ## Design docs
 
-- [`docs/L1_L2_L3_REDESIGN.md`](docs/L1_L2_L3_REDESIGN.md) — **current design
+- [`docs/L1_L2_L3_REDESIGN.md`](docs/L1_L2_L3_REDESIGN.md) — **core design
   spec** for the L1/L2/L3 differential layer model (schema v4 base + v5 L3
-  classification extension). Authoritative.
-- [`docs/PUBLIC_RELEASE_PLAN.md`](docs/PUBLIC_RELEASE_PLAN.md) — public release
-  plan (CLI surface, package.json layout, § 0 fallback rule)
+  classification extension). Authoritative for the memory layering rules.
+- [`docs/INHERITANCE_ON_CLEAR_ONLY.md`](docs/INHERITANCE_ON_CLEAR_ONLY.md) —
+  design record for the `/tl` baton handoff system (schema v6–v7). Explains
+  why the current inheritance is opt-in rather than heuristic.
+- [`docs/PUBLIC_RELEASE_PLAN.md`](docs/PUBLIC_RELEASE_PLAN.md) — public
+  release plan, implementation status by version, § 0 fallback rule, and
+  remaining tasks.
 - [`docs/archive/`](docs/archive/) — superseded design documents kept for
-  historical reference (original CONCEPT, session-linking experiments, etc.)
+  historical reference (original CONCEPT, session-linking experiments,
+  pre-publish action list).
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "throughline",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "type": "module",
   "description": "Claude Code hooks plugin for structured context compression (/clear-safe persistent memory)",
   "keywords": [

package/src/token-monitor.mjs

@@ -231,6 +231,30 @@ export function shouldForceFullRedraw(prevCols, currCols) {
   return prevCols !== currCols && currCols > 0;
 }
 
+/**
+ * 描画に使う列幅を解決する。
+ *
+ * 優先順:
+ *   1. `process.stdout.columns` が 40 以上 → その値から 1 引いたもの (末尾列での自動改行回避)
+ *   2. `process.env.COLUMNS` が 40 以上 → その値
+ *   3. それ以外 → 200 にフォールバック（VSCode の `type: process` タスクで stdout が
+ *      TTY でない場合、columns が undefined または 0/12 のような極端に小さい値を
+ *      返すことがあり、そのまま使うと描画が「openclaw」で切れるなどの視覚崩れが出る）
+ *
+ * 「40 未満は無視」閾値は、現行 formatLine の最小構成（marker + project(18) + id(8) +
+ * ago(8) + bar(20) + ...）が実用上 40 セル未満になり得ないため。
+ *
+ * 固定 200 フォールバックは、truncateToCells が 200 セルより短い実内容を
+ * そのまま通す (伸長しない) ので過大でも副作用なし。
+ */
+export function resolveColumns() {
+  const reported = typeof process.stdout.columns === 'number' ? process.stdout.columns : 0;
+  if (reported >= 40) return reported - 1;
+  const fromEnv = Number(process.env.COLUMNS);
+  if (Number.isFinite(fromEnv) && fromEnv >= 40) return fromEnv - 1;
+  return 200;
+}
+
 function formatLine({ state, usage, isActive, now = Date.now() }) {
   const project = basename(state.projectPath || '?');
   const shortId = state.sessionId.slice(0, 8);
@@ -263,11 +287,15 @@ function formatLine({ state, usage, isActive, now = Date.now() }) {
   const modelCol = usage?.model ? color(ANSI.dim, usage.model) : color(ANSI.dim, '(未取得)');
   // 最終更新からの経過: 表示が「止まって見える」とき、それが idle なのか障害なのかを
   // 即座に判別できるようにする。updatedAt は state.writeSessionState 時の Date.now()。
-  const ago = typeof state.updatedAt === 'number'
-    ? color(ANSI.dim, `(${formatTimeAgo(now - state.updatedAt)})`)
+  // 位置は session id の直後（左寄せ固定幅）。狭いターミナルでもモデル名より先に
+  // 切れない位置に置くのと、縦の視線移動で「どれが最新更新か」を把握しやすくするため。
+  const agoText = typeof state.updatedAt === 'number'
+    ? formatTimeAgo(now - state.updatedAt)
     : '';
+  // 8 セル固定: "just now" が最長 (8 セル)、"99d ago" は 7 セル。括弧なしで OK
+  const agoCol = color(ANSI.dim, padCellsEnd(agoText, 8));
 
-  return `${marker} ${projectCol} ${idCol} ${barCol} ${tokCol}  ${remCol}  ${modelCol} ${ago}${warn}`;
+  return `${marker} ${projectCol} ${idCol} ${agoCol} ${barCol} ${tokCol}  ${remCol}  ${modelCol}${warn}`;
 }
 
 // --- フィルタ ---
@@ -383,9 +411,7 @@ function renderFrame(args) {
   //   こうすれば ANSI.up(lines.length) と論理行数が物理行数と一致する。
   //   columns - 1 にしてるのはターミナル末尾列に書くと自動改行する端末があるため。
   //   truncateToCells は CJK / 絵文字を 2 セルとして正しく数える。
-  const columns = process.stdout.columns && process.stdout.columns > 10
-    ? process.stdout.columns - 1
-    : 120;
+  const columns = resolveColumns();
   const clipped = lines.map((l) => truncateToCells(l, columns));
 
   // 前フレームを消去してから再描画:
@@ -520,6 +546,7 @@ export const _internal = {
   resetRenderKeyCache,
   formatTimeAgo,
   shouldForceFullRedraw,
+  resolveColumns,
 };
 
 // --- エントリポイント自動起動 ---

package/src/token-monitor.test.mjs

@@ -15,6 +15,7 @@ const {
   formatLine,
   formatTimeAgo,
   shouldForceFullRedraw,
+  resolveColumns,
 } = _internal;
 
 // state-file は projectPath を resolve + lowercase 正規化する。
@@ -385,6 +386,58 @@ test('shouldForceFullRedraw: 片方 0 以下は false (未初期化 or 無効)',
   assert.equal(shouldForceFullRedraw(0, 80), true);
 });
 
+// ─── resolveColumns ───────────────────────────────────────────────
+
+test('resolveColumns: process.stdout.columns が 40 以上ならそれ - 1 を返す', () => {
+  const orig = process.stdout.columns;
+  try {
+    Object.defineProperty(process.stdout, 'columns', { value: 120, configurable: true, writable: true });
+    assert.equal(resolveColumns(), 119);
+  } finally {
+    Object.defineProperty(process.stdout, 'columns', { value: orig, configurable: true, writable: true });
+  }
+});
+
+test('resolveColumns: columns が小さすぎる値 (12 等) ならフォールバック 200', () => {
+  const orig = process.stdout.columns;
+  const origEnv = process.env.COLUMNS;
+  try {
+    Object.defineProperty(process.stdout, 'columns', { value: 12, configurable: true, writable: true });
+    delete process.env.COLUMNS;
+    assert.equal(resolveColumns(), 200);
+  } finally {
+    Object.defineProperty(process.stdout, 'columns', { value: orig, configurable: true, writable: true });
+    if (origEnv !== undefined) process.env.COLUMNS = origEnv;
+  }
+});
+
+test('resolveColumns: columns が undefined でも env.COLUMNS >= 40 があればそれを使う', () => {
+  const orig = process.stdout.columns;
+  const origEnv = process.env.COLUMNS;
+  try {
+    Object.defineProperty(process.stdout, 'columns', { value: undefined, configurable: true, writable: true });
+    process.env.COLUMNS = '150';
+    assert.equal(resolveColumns(), 149);
+  } finally {
+    Object.defineProperty(process.stdout, 'columns', { value: orig, configurable: true, writable: true });
+    if (origEnv === undefined) delete process.env.COLUMNS;
+    else process.env.COLUMNS = origEnv;
+  }
+});
+
+test('resolveColumns: 全てのソースが無効ならフォールバック 200', () => {
+  const orig = process.stdout.columns;
+  const origEnv = process.env.COLUMNS;
+  try {
+    Object.defineProperty(process.stdout, 'columns', { value: undefined, configurable: true, writable: true });
+    delete process.env.COLUMNS;
+    assert.equal(resolveColumns(), 200);
+  } finally {
+    Object.defineProperty(process.stdout, 'columns', { value: orig, configurable: true, writable: true });
+    if (origEnv !== undefined) process.env.COLUMNS = origEnv;
+  }
+});
+
 // ─── formatLine: time-ago 表示 ────────────────────────────────────
 
 test('formatLine: updatedAt から経過時間が表示される', () => {
@@ -395,12 +448,30 @@ test('formatLine: updatedAt から経過時間が表示される', () => {
   };
   args.state.updatedAt = now - 3 * 60 * 1000; // 3 分前
   const out = stripColors(formatLine(args));
-  assert.ok(out.includes('(3m ago)'), `expected "(3m ago)" in output: ${out}`);
+  assert.ok(out.includes('3m ago'), `expected "3m ago" in output: ${out}`);
 });
 
-test('formatLine: updatedAt が無ければ ago 表示は出ない', () => {
+test('formatLine: updatedAt が無ければ ago テキストは空', () => {
   const args = makeLineArgs(0.5);
   delete args.state.updatedAt;
   const out = stripColors(formatLine(args));
   assert.ok(!out.includes('ago'));
+  assert.ok(!out.includes('just now'));
+});
+
+test('formatLine: ago は session id のすぐ右に配置される（狭幅でも切れない位置）', () => {
+  const now = Date.now();
+  const args = {
+    ...makeLineArgs(0.5),
+    now,
+  };
+  args.state.updatedAt = now - 5 * 60 * 1000; // 5m
+  const out = stripColors(formatLine(args));
+  // shortId と 5m ago の位置関係: shortId が先、ago がその後、bar (█ or ░) がさらに後
+  const idPos = out.indexOf('abc12345');
+  const agoPos = out.indexOf('5m ago');
+  const barPos = out.search(/[█░]/);
+  assert.ok(idPos >= 0 && agoPos >= 0 && barPos >= 0, 'all fields present');
+  assert.ok(idPos < agoPos, 'shortId before ago');
+  assert.ok(agoPos < barPos, 'ago before bar');
 });

package/src/vscode-task.mjs

@@ -109,6 +109,12 @@ export function hasMonitorTask(obj) {
  * 依存して失敗しうる。process は command を直接起動するため堅い。
  * command には Node 実行ファイルの絶対パスを入れ、args に throughline.mjs の
  * 絶対パスと 'monitor' サブコマンドを渡す。
+ *
+ * options.env.COLUMNS=200 を渡す理由:
+ *   type: 'process' では VSCode は PTY を張らず stdout をパイプするため、
+ *   子プロセスの `process.stdout.columns` が undefined か極端に小さい値になり、
+ *   モニターの幅計算が破綻する。COLUMNS env を明示しておけば token-monitor の
+ *   resolveColumns() が 200 を採用して行が「openclaw」で切れる不具合を避けられる。
  */
 export function buildMonitorTask(throughlineBin) {
   return {
@@ -117,6 +123,9 @@ export function buildMonitorTask(throughlineBin) {
     type: 'process',
     command: process.execPath,
     args: [throughlineBin, 'monitor'],
+    options: {
+      env: { COLUMNS: '200' },
+    },
     isBackground: true,
     presentation: {
       reveal: 'always',

package/src/vscode-task.test.mjs

@@ -148,6 +148,13 @@ test('buildMonitorTask: uses type=process with provided bin as args[0]', () => {
   assert.equal(task.isBackground, true);
 });
 
+test('buildMonitorTask: sets COLUMNS=200 env to work around type:process non-TTY stdout', () => {
+  const task = buildMonitorTask('/abs/bin/throughline.mjs');
+  assert.ok(task.options, 'task should carry options');
+  assert.ok(task.options.env, 'options should carry env');
+  assert.equal(task.options.env.COLUMNS, '200');
+});
+
 // --- ensureMonitorTaskFile: skip conditions ---
 
 test('ensureMonitorTaskFile: opt_out via THROUGHLINE_NO_VSCODE=1', () => {