Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 2 commits into from
Feb 13, 2026
Merged

Move pending approval derivation and thread visit tracking to shared session logic #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7abe5
Move approval derivation and thread visit tracking into core session log
juliusmarminge Feb 13, 2026
cab54fe
whoop
juliusmarminge Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 1 addition & 62 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
type ProviderSendTurnAttachmentInput,
type ProviderApprovalDecision,
type ProviderEvent,
} from "@t3tools/contracts";
import {
type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
resolveModelSlug,
} from "../model-logic";
import {
derivePendingApprovals,
derivePhase,
deriveTimelineEntries,
deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
return "text-muted-foreground/40";
}

interface PendingApprovalCard {
requestId: string;
requestKind: "command" | "file-change";
createdAt: string;
detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
if (!value || typeof value !== "object") return undefined;
return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
const payload = asRecord(event.payload);
const command = asString(payload?.command);
if (command) return command;
return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
const pending = new Map<string, PendingApprovalCard>();
const ordered = [...events].toReversed();

for (const event of ordered) {
if (event.method === "session/closed" || event.method === "session/exited") {
pending.clear();
continue;
}

const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
if (!requestId) continue;

if (
event.kind === "request" &&
(event.requestKind === "command" || event.requestKind === "file-change")
) {
const detail = approvalDetail(event);
pending.set(requestId, {
requestId,
requestKind: event.requestKind,
createdAt: event.createdAt,
...(detail ? { detail } : {}),
});
continue;
}

if (event.method === "item/requestApproval/decision") {
pending.delete(requestId);
}
}

return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
(activeThread.messages.length > 0 ||
(activeThread.session !== null && activeThread.session.status !== "closed")),
);
const terminalShortcutHint = navigator.platform.includes("Mac")
? "\u2318J"
: "Ctrl+J";
const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
for (const image of images) {
if (!image.previewUrl) continue;
Expand Down
89 changes: 78 additions & 11 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
if (status === "running") return "Working";
if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
label: "Working" | "Connecting" | "Completed" | "Awaiting response";
colorClass: string;
dotClass: string;
pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
if (!thread.latestTurnCompletedAt) return false;
const completedAt = Date.parse(thread.latestTurnCompletedAt);
if (Number.isNaN(completedAt)) return false;
if (!thread.lastVisitedAt) return true;

const lastVisitedAt = Date.parse(thread.lastVisitedAt);
if (Number.isNaN(lastVisitedAt)) return true;
return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
if (hasPendingApprovals) {
return {
label: "Awaiting response",
colorClass: "text-amber-600 dark:text-amber-300/90",
dotClass: "bg-amber-500 dark:bg-amber-300/90",
pulse: false,
};
}

if (thread.session?.status === "running") {
return {
label: "Working",
colorClass: "text-sky-600 dark:text-sky-300/80",
dotClass: "bg-sky-500 dark:bg-sky-300/80",
pulse: true,
};
}

if (thread.session?.status === "connecting") {
return {
label: "Connecting",
colorClass: "text-sky-600 dark:text-sky-300/80",
dotClass: "bg-sky-500 dark:bg-sky-300/80",
pulse: true,
};
}

if (hasUnseenCompletion(thread)) {
return {
label: "Completed",
colorClass: "text-emerald-600 dark:text-emerald-300/90",
dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
pulse: false,
};
}

return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
const [newCwd, setNewCwd] = useState("");
const [isPickingFolder, setIsPickingFolder] = useState(false);
const [isAddingProject, setIsAddingProject] = useState(false);
const pendingApprovalByThreadId = useMemo(() => {
const map = new Map<string, boolean>();
for (const thread of state.threads) {
map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
}
return map;
}, [state.threads]);

const handleNewThread = useCallback(
(projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
<div className="ml-2 border-l border-border/80 pl-2">
{threads.map((thread) => {
const isActive = state.activeThreadId === thread.id;
const threadStatus = threadStatusLabel(thread.session?.status);
const threadStatus = threadStatusPill(
thread,
pendingApprovalByThreadId.get(thread.id) === true,
);
return (
<button
key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
<span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
<span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
<span className="hidden xl:inline">{threadStatus}</span>
<span
className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
>
<span
className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
threadStatus.pulse ? "animate-pulse" : ""
}`}
/>
<span className="hidden md:inline">{threadStatus.label}</span>
</span>
)}
<span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/persistenceSchema.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
terminalHeight: 360,
messages: [],
createdAt: "2026-02-08T10:00:00.000Z",
lastVisitedAt: "2026-02-08T10:01:00.000Z",
},
],
activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
const hydrated = hydratePersistedState(payload, false);
expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
});

it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
events: [],
error: "boom",
createdAt: "2026-02-08T10:00:00.000Z",
lastVisitedAt: "2026-02-08T10:02:00.000Z",
branch: null,
worktreePath: null,
};
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
},
],
createdAt: thread.createdAt,
lastVisitedAt: thread.lastVisitedAt,
branch: null,
worktreePath: null,
});
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/persistenceSchema.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
),
messages: z.array(persistedMessageSchema),
createdAt: z.string().min(1),
lastVisitedAt: z.string().min(1).optional(),
branch: z.string().min(1).nullable().optional(),
worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
events: [],
error: null,
createdAt: thread.createdAt,
lastVisitedAt: thread.lastVisitedAt,
branch: thread.branch ?? null,
worktreePath: thread.worktreePath ?? null,
};
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
streaming: message.streaming,
})),
createdAt: thread.createdAt,
...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
branch: thread.branch,
worktreePath: thread.worktreePath,
})),
Expand Down
68 changes: 68 additions & 0 deletions apps/web/src/session-logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
type WorkLogEntry,
applyEventToMessages,
derivePendingApprovals,
deriveTimelineEntries,
deriveWorkLogEntries,
evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
});
});

describe("derivePendingApprovals", () => {
it("returns pending command/file-change approvals", () => {
const approvals = derivePendingApprovals([
makeEvent({
id: "evt-request",
kind: "request",
method: "item/commandExecution/requestApproval",
requestId: "req-1",
requestKind: "command",
createdAt: "2026-02-08T10:00:00.000Z",
payload: { command: "git commit -m 'msg'" },
}),
]);

expect(approvals).toEqual([
{
requestId: "req-1",
requestKind: "command",
createdAt: "2026-02-08T10:00:00.000Z",
detail: "git commit -m 'msg'",
},
]);
});

it("removes approvals after a decision event", () => {
const approvals = derivePendingApprovals([
makeEvent({
id: "evt-decision",
method: "item/requestApproval/decision",
requestId: "req-1",
createdAt: "2026-02-08T10:00:01.000Z",
}),
makeEvent({
id: "evt-request",
kind: "request",
method: "item/fileChange/requestApproval",
requestId: "req-1",
requestKind: "file-change",
createdAt: "2026-02-08T10:00:00.000Z",
}),
]);

expect(approvals).toHaveLength(0);
});

it("clears pending approvals after turn completion", () => {
const approvals = derivePendingApprovals([
makeEvent({
id: "evt-turn-complete",
method: "turn/completed",
createdAt: "2026-02-08T10:00:01.000Z",
payload: { turn: { id: "turn-1", status: "completed" } },
}),
makeEvent({
id: "evt-request",
kind: "request",
method: "item/commandExecution/requestApproval",
requestId: "req-1",
requestKind: "command",
createdAt: "2026-02-08T10:00:00.000Z",
}),
]);

expect(approvals).toHaveLength(0);
});
});

describe("evolveSession", () => {
it("updates thread id when thread starts", () => {
const previous = makeSession();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Move pending approval derivation and thread visit tracking to shared session logic#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 2 commits into

from

Feb 13, 2026
 Merged


Move pending approval derivation and thread visit tracking to shared session logic
#16
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1b7abe5

Move approval derivation and thread visit tracking into core session log


juliusmarminge Feb 13, 2026
cab54fe

whoop


juliusmarminge Feb 13, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


63 changes: 1 addition & 62 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import {
 PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 type ProviderSendTurnAttachmentInput,
 type ProviderApprovalDecision,
 type ProviderEvent,
} from "@t3tools/contracts";
import {
 type ClipboardEvent,
Expand All@@ -30,6 +29,7 @@ import {
 resolveModelSlug,
} from "../model-logic";
import {
 derivePendingApprovals,
 derivePhase,
 deriveTimelineEntries,
 deriveWorkLogEntries,
Expand DownExpand Up@@ -74,13 +74,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
 return "text-muted-foreground/40";
}

interface PendingApprovalCard {
 requestId: string;
 requestKind: "command" | "file-change";
 createdAt: string;
 detail?: string;
}

type SessionContinuityState = "resumed" | "new" | "fallback_new";

interface EnsuredSessionInfo {
Expand All@@ -99,57 +92,6 @@ interface ExpandedImagePreview {
 name: string;
}

function asRecord(value: unknown): Record<string, unknown> | undefined {
 if (!value || typeof value !== "object") return undefined;
 return value as Record<string, unknown>;
}

function asString(value: unknown): string | undefined {
 return typeof value === "string" ? value : undefined;
}

function approvalDetail(event: ProviderEvent): string | undefined {
 const payload = asRecord(event.payload);
 const command = asString(payload?.command);
 if (command) return command;
 return asString(payload?.reason);
}

function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
 const pending = new Map<string, PendingApprovalCard>();
 const ordered = [...events].toReversed();

 for (const event of ordered) {
 if (event.method === "session/closed" || event.method === "session/exited") {
 pending.clear();
 continue;
 }

 const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
 if (!requestId) continue;

 if (
 event.kind === "request" &&
 (event.requestKind === "command" || event.requestKind === "file-change")
 ) {
 const detail = approvalDetail(event);
 pending.set(requestId, {
 requestId,
 requestKind: event.requestKind,
 createdAt: event.createdAt,
 ...(detail ? { detail } : {}),
 });
 continue;
 }

 if (event.method === "item/requestApproval/decision") {
 pending.delete(requestId);
 }
 }

 return Array.from(pending.values());
}

function readFileAsDataUrl(file: File): Promise<string> {
 return new Promise((resolve, reject) => {
 const reader = new FileReader();
Expand DownExpand Up@@ -305,9 +247,6 @@ export default function ChatView() {
 (activeThread.messages.length > 0 ||
 (activeThread.session !== null && activeThread.session.status !== "closed")),
 );
 const terminalShortcutHint = navigator.platform.includes("Mac")
 ? "\u2318J"
 : "Ctrl+J";
 const revokePreviewUrls = useCallback((images: Array<{ previewUrl?: string }>) => {
 for (const image of images) {
 if (!image.previewUrl) continue;
Expand Down

89 changes: 78 additions & 11 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { isElectron } from "../env";
import { useTheme } from "../hooks/useTheme";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project } from "../types";
import { DEFAULT_THREAD_TERMINAL_HEIGHT, type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";

const THEME_CYCLE = { system: "light", light: "dark", dark: "system" } as const;
Expand All@@ -25,11 +26,61 @@ function inferProjectName(cwd: string): string {
 return last && last.length > 0 ? last : "project";
}

function threadStatusLabel(
 status: "connecting" | "ready" | "running" | "error" | "closed" | undefined,
): "Working" | "Connecting" | null {
 if (status === "running") return "Working";
 if (status === "connecting") return "Connecting";
interface ThreadStatusPill {
 label: "Working" | "Connecting" | "Completed" | "Awaiting response";
 colorClass: string;
 dotClass: string;
 pulse: boolean;
}

function hasUnseenCompletion(thread: Thread): boolean {
 if (!thread.latestTurnCompletedAt) return false;
 const completedAt = Date.parse(thread.latestTurnCompletedAt);
 if (Number.isNaN(completedAt)) return false;
 if (!thread.lastVisitedAt) return true;

 const lastVisitedAt = Date.parse(thread.lastVisitedAt);
 if (Number.isNaN(lastVisitedAt)) return true;
 return completedAt > lastVisitedAt;
}

function threadStatusPill(thread: Thread, hasPendingApprovals: boolean): ThreadStatusPill | null {
 if (hasPendingApprovals) {
 return {
 label: "Awaiting response",
 colorClass: "text-amber-600 dark:text-amber-300/90",
 dotClass: "bg-amber-500 dark:bg-amber-300/90",
 pulse: false,
 };
 }

 if (thread.session?.status === "running") {
 return {
 label: "Working",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (thread.session?.status === "connecting") {
 return {
 label: "Connecting",
 colorClass: "text-sky-600 dark:text-sky-300/80",
 dotClass: "bg-sky-500 dark:bg-sky-300/80",
 pulse: true,
 };
 }

 if (hasUnseenCompletion(thread)) {
 return {
 label: "Completed",
 colorClass: "text-emerald-600 dark:text-emerald-300/90",
 dotClass: "bg-emerald-500 dark:bg-emerald-300/90",
 pulse: false,
 };
 }

 return null;
}

Expand All@@ -41,6 +92,13 @@ export default function Sidebar() {
 const [newCwd, setNewCwd] = useState("");
 const [isPickingFolder, setIsPickingFolder] = useState(false);
 const [isAddingProject, setIsAddingProject] = useState(false);
 const pendingApprovalByThreadId = useMemo(() => {
 const map = new Map<string, boolean>();
 for (const thread of state.threads) {
 map.set(thread.id, derivePendingApprovals(thread.events).length > 0);
 }
 return map;
 }, [state.threads]);

 const handleNewThread = useCallback(
 (projectId: string) => {
Expand DownExpand Up@@ -312,7 +370,10 @@ export default function Sidebar() {
 <div className="ml-2 border-l border-border/80 pl-2">
 {threads.map((thread) => {
 const isActive = state.activeThreadId === thread.id;
 const threadStatus = threadStatusLabel(thread.session?.status);
 const threadStatus = threadStatusPill(
 thread,
 pendingApprovalByThreadId.get(thread.id) === true,
 );
 return (
 <button
 key={thread.id}
Expand All@@ -338,9 +399,15 @@ export default function Sidebar() {
 >
 <div className="flex min-w-0 flex-1 items-center gap-1.5">
 {threadStatus && (
 <span className="inline-flex items-center gap-1 text-[10px] text-sky-600 dark:text-sky-300/80">
 <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-sky-500 dark:bg-sky-300/80" />
 <span className="hidden xl:inline">{threadStatus}</span>
 <span
 className={`inline-flex items-center gap-1 text-[10px] ${threadStatus.colorClass}`}
 >
 <span
 className={`h-1.5 w-1.5 rounded-full ${threadStatus.dotClass} ${
 threadStatus.pulse ? "animate-pulse" : ""
 }`}
 />
 <span className="hidden md:inline">{threadStatus.label}</span>
 </span>
 )}
 <span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
Expand Down

4 changes: 4 additions & 0 deletions
apps/web/src/persistenceSchema.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,7 @@ describe("hydratePersistedState", () => {
 terminalHeight: 360,
 messages: [],
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:01:00.000Z",
 },
 ],
 activeThreadId: "t-1",
Expand All@@ -149,6 +150,7 @@ describe("hydratePersistedState", () => {
 const hydrated = hydratePersistedState(payload, false);
 expect(hydrated?.threads[0]?.terminalOpen).toBe(true);
 expect(hydrated?.threads[0]?.terminalHeight).toBe(360);
 expect(hydrated?.threads[0]?.lastVisitedAt).toBe("2026-02-08T10:01:00.000Z");
 });

 it("defaults terminalHeight when hydrating v5 payloads", () => {
Expand DownExpand Up@@ -217,6 +219,7 @@ describe("toPersistedState", () => {
 events: [],
 error: "boom",
 createdAt: "2026-02-08T10:00:00.000Z",
 lastVisitedAt: "2026-02-08T10:02:00.000Z",
 branch: null,
 worktreePath: null,
 };
Expand DownExpand Up@@ -265,6 +268,7 @@ describe("toPersistedState", () => {
 },
 ],
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: null,
 worktreePath: null,
 });
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/persistenceSchema.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ const persistedThreadSchema = z.object({
 ),
 messages: z.array(persistedMessageSchema),
 createdAt: z.string().min(1),
 lastVisitedAt: z.string().min(1).optional(),
 branch: z.string().min(1).nullable().optional(),
 worktreePath: z.string().min(1).nullable().optional(),
});
Expand DownExpand Up@@ -153,6 +154,7 @@ function hydrateThread(
 events: [],
 error: null,
 createdAt: thread.createdAt,
 lastVisitedAt: thread.lastVisitedAt,
 branch: thread.branch ?? null,
 worktreePath: thread.worktreePath ?? null,
 };
Expand DownExpand Up@@ -228,6 +230,7 @@ export function toPersistedState(
 streaming: message.streaming,
 })),
 createdAt: thread.createdAt,
 ...(thread.lastVisitedAt ? { lastVisitedAt: thread.lastVisitedAt } : {}),
 branch: thread.branch,
 worktreePath: thread.worktreePath,
 })),
Expand Down

68 changes: 68 additions & 0 deletions
apps/web/src/session-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { ProviderEvent, ProviderSession } from "@t3tools/contracts";
import {
 type WorkLogEntry,
 applyEventToMessages,
 derivePendingApprovals,
 deriveTimelineEntries,
 deriveWorkLogEntries,
 evolveSession,
Expand DownExpand Up@@ -392,6 +393,73 @@ describe("deriveWorkLogEntries", () => {
 });
});

describe("derivePendingApprovals", () => {
 it("returns pending command/file-change approvals", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 payload: { command: "git commit -m 'msg'" },
 }),
 ]);

 expect(approvals).toEqual([
 {
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 detail: "git commit -m 'msg'",
 },
 ]);
 });

 it("removes approvals after a decision event", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-decision",
 method: "item/requestApproval/decision",
 requestId: "req-1",
 createdAt: "2026-02-08T10:00:01.000Z",
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/fileChange/requestApproval",
 requestId: "req-1",
 requestKind: "file-change",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });

 it("clears pending approvals after turn completion", () => {
 const approvals = derivePendingApprovals([
 makeEvent({
 id: "evt-turn-complete",
 method: "turn/completed",
 createdAt: "2026-02-08T10:00:01.000Z",
 payload: { turn: { id: "turn-1", status: "completed" } },
 }),
 makeEvent({
 id: "evt-request",
 kind: "request",
 method: "item/commandExecution/requestApproval",
 requestId: "req-1",
 requestKind: "command",
 createdAt: "2026-02-08T10:00:00.000Z",
 }),
 ]);

 expect(approvals).toHaveLength(0);
 });
});

describe("evolveSession", () => {
 it("updates thread id when thread starts", () => {
 const previous = makeSession();
Expand Down
Loading