@gajae-code/coding-agent 0.9.3 → 0.9.4

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.9.4] - 2026-07-09
+### Fixed
+
+- `RpcClient.onSessionEvent()` now exposes the full renderer-facing agent-wire event stream instead of dropping non-core session events such as notices, todo reminders, retry events, subagent steering, thinking-level changes, and goal updates, while `onEvent()` remains the filtered legacy `AgentEvent` subscription path.
+- Clarified `/session delete` help, confirmation, and completion wording to specify current vs. selected session transcript/artifact deletion and that other sessions plus topic/history metadata are not removed (#1913).
+- Home screen build labels now come from install/build metadata, so release binaries and package installs no longer show a misleading dev build label (#1911).
+
 ## [0.9.3] - 2026-07-09
 
 ### Fixed

package/dist/types/build-metadata.d.ts

@@ -0,0 +1,7 @@
+export type BuildChannel = "release" | "dev" | "local-source" | "package-install" | "compiled" | "unknown";
+export interface BuildMetadata {
+    channel: BuildChannel;
+    label: string;
+}
+export declare function resolveBuildMetadata(moduleDir?: string): BuildMetadata;
+export declare function formatBuildLabel(metadata?: BuildMetadata): string;

package/dist/types/config/keybindings.d.ts

@@ -297,11 +297,11 @@ export declare const KEYBINDINGS: {
     };
     readonly "app.session.delete": {
         readonly defaultKeys: "ctrl+d";
-        readonly description: "Delete session";
+        readonly description: "Delete current session transcript/artifacts";
     };
     readonly "app.session.deleteNoninvasive": {
         readonly defaultKeys: "ctrl+backspace";
-        readonly description: "Delete session (non-invasive)";
+        readonly description: "Delete selected session transcript/artifacts (non-invasive)";
     };
     readonly "app.tree.foldOrUp": {
         readonly defaultKeys: ["ctrl+left", "alt+left"];

package/dist/types/modes/components/hook-selector.d.ts

@@ -48,6 +48,7 @@ export interface HookSelectorOptions {
 export declare class HookSelectorComponent extends Container {
     #private;
     constructor(title: string, options: string[], onSelect: (option: string) => void, onCancel: () => void, opts?: HookSelectorOptions);
+    hasActiveInlineInput(): boolean;
     handleInput(keyData: string): void;
     dispose(): void;
 }

package/dist/types/modes/components/welcome.d.ts

@@ -14,6 +14,7 @@ export interface WelcomeComponentOptions {
     getReservedBottomRows?: (termWidth: number) => number;
     changelogMarkdown?: string;
     collapseChangelog?: boolean;
+    buildLabel?: string;
 }
 /**
  * GJC-native launch surface with compact command affordances, project

package/dist/types/modes/rpc/rpc-client.d.ts

@@ -7,7 +7,7 @@ import type { AgentEvent, AgentMessage, AgentToolResult, ThinkingLevel } from "@
 import type { CompactionResult } from "@gajae-code/agent-core/compaction";
 import type { ImageContent, Model } from "@gajae-code/ai";
 import type { BashResult } from "../../exec/bash-executor";
-import type { SessionStats } from "../../session/agent-session";
+import type { AgentSessionEvent, SessionStats } from "../../session/agent-session";
 import type { RpcExtensionUIRequest, RpcGetStateInclude, RpcHandoffResult, RpcHostToolDefinition, RpcSessionState, RpcUnattendedAccepted, RpcUnattendedDeclaration, RpcWorkflowGate, RpcWorkflowGateResolution } from "./rpc-types";
 export interface RpcClientOptions {
     /** Dial an existing Unix-domain socket instead of spawning a stdio child. */
@@ -37,6 +37,7 @@ export interface RpcClientOptions {
 }
 export type ModelInfo = Pick<Model, "provider" | "id" | "contextWindow" | "reasoning" | "thinking">;
 export type RpcEventListener = (event: AgentEvent) => void;
+export type RpcSessionEventListener = (event: AgentSessionEvent) => void;
 export interface RpcClientToolContext<TDetails = unknown> {
     toolCallId: string;
     signal: AbortSignal;
@@ -72,9 +73,13 @@ export declare class RpcClient {
      */
     [Symbol.dispose](): void;
     /**
-     * Subscribe to agent events.
+     * Subscribe to the legacy core AgentEvent subset.
      */
     onEvent(listener: RpcEventListener): () => void;
+    /**
+     * Subscribe to all renderer-facing agent session events.
+     */
+    onSessionEvent(listener: RpcSessionEventListener): () => void;
     /**
      * Subscribe to workflow lifecycle gates emitted by RPC mode.
      */

package/dist/types/notifications/telegram-daemon.d.ts

@@ -375,6 +375,8 @@ export declare class TelegramNotificationDaemon {
     private rememberPendingThreadedFrame;
     private flushPendingThreadedFrames;
     private ensureTopic;
+    private topicPastOrphanGrace;
+    private deleteOrphanedTopic;
     private deleteTopic;
     private persistTopics;
     loadTopics(): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/coding-agent",
-	"version": "0.9.3",
+	"version": "0.9.4",
 	"description": "Gajae Code CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -49,12 +49,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@gajae-code/stats": "0.9.3",
-		"@gajae-code/agent-core": "0.9.3",
-		"@gajae-code/ai": "0.9.3",
-		"@gajae-code/natives": "0.9.3",
-		"@gajae-code/tui": "0.9.3",
-		"@gajae-code/utils": "0.9.3",
+		"@gajae-code/stats": "0.9.4",
+		"@gajae-code/agent-core": "0.9.4",
+		"@gajae-code/ai": "0.9.4",
+		"@gajae-code/natives": "0.9.4",
+		"@gajae-code/tui": "0.9.4",
+		"@gajae-code/utils": "0.9.4",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/scripts/compile-args.ts

@@ -14,7 +14,10 @@ export const compileAutoloadDisableFlags = [
 	"--no-compile-autoload-package-json",
 ];
 
-export const compiledDefineFlags = ['process.env.PI_COMPILED="true"'];
+const compiledDefineFlags = ['process.env.PI_COMPILED="true"'];
+const releaseDefineFlags = [...compiledDefineFlags, 'process.env.GJC_BUILD_CHANNEL="release"'];
+const devDefineFlags = [...compiledDefineFlags, 'process.env.GJC_BUILD_CHANNEL="dev"'];
+
 export const compiledExternalPackages = ["mupdf"];
 
 export const releaseEntrypoints = [
@@ -24,7 +27,9 @@ export const releaseEntrypoints = [
 	"./packages/coding-agent/src/eval/js/worker-entry.ts",
 	"./packages/natives/native/index.js",
 	"./packages/coding-agent/src/notifications/telegram-daemon-cli.ts",
-	"./packages/ai/src/models.json",
+	// NOTE: models.json must NOT be listed here — `bun build --compile` does not
+	// emit `.json` extra entrypoints into the bunfs. It is embedded via the
+	// `with { type: "file" }` import in packages/ai/src/models.ts instead.
 	"./node_modules/handlebars/lib/index.js",
 ];
 
@@ -34,7 +39,6 @@ export const devEntrypoints = [
 	"./src/tools/browser/tab-worker-entry.ts",
 	"./src/eval/js/worker-entry.ts",
 	"./src/notifications/telegram-daemon-cli.ts",
-	"../ai/src/models.json",
 	"../../node_modules/handlebars/lib/index.js",
 ];
 
@@ -44,7 +48,8 @@ export function buildReleaseCompileArgs(target: string, outfile: string): string
 		entrypoints: releaseEntrypoints,
 		outfile,
 		target,
-		defines: compiledDefineFlags,
+		defines: releaseDefineFlags,
+
 		externals: compiledExternalPackages,
 	});
 }
@@ -54,7 +59,7 @@ export function buildDevCompileArgs(outfile = "dist/gjc"): string[] {
 		root: "../..",
 		entrypoints: devEntrypoints,
 		outfile,
-		defines: compiledDefineFlags,
+		defines: devDefineFlags,
 		externals: compiledExternalPackages,
 	});
 }

package/src/build-metadata.ts

@@ -0,0 +1,104 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { isCompiledBinary } from "@gajae-code/utils/env";
+
+export type BuildChannel = "release" | "dev" | "local-source" | "package-install" | "compiled" | "unknown";
+
+export interface BuildMetadata {
+	channel: BuildChannel;
+	label: string;
+}
+
+const REPO_MARKERS = [".git", "bun.lock"];
+const SOURCE_REPO_PACKAGE_NAME = "gajae-code";
+
+export function resolveBuildMetadata(moduleDir: string = import.meta.dir): BuildMetadata {
+	const explicitChannel = normalizeBuildChannel(process.env.GJC_BUILD_CHANNEL);
+	if (explicitChannel) {
+		return metadataForChannel(explicitChannel);
+	}
+
+	if (isCompiledBinary()) {
+		return metadataForChannel("compiled");
+	}
+
+	if (isLocalSourceTree(moduleDir)) {
+		return metadataForChannel("local-source");
+	}
+
+	return metadataForChannel("package-install");
+}
+
+export function formatBuildLabel(metadata: BuildMetadata = resolveBuildMetadata()): string {
+	return metadata.label;
+}
+
+function normalizeBuildChannel(value: string | undefined): BuildChannel | undefined {
+	const normalized = value?.trim().toLowerCase();
+	if (!normalized) return undefined;
+	switch (normalized) {
+		case "release":
+		case "stable":
+			return "release";
+		case "dev":
+		case "development":
+			return "dev";
+		case "local-source":
+		case "source":
+		case "local":
+			return "local-source";
+		case "package-install":
+		case "package":
+		case "npm":
+			return "package-install";
+		case "compiled":
+			return "compiled";
+		case "unknown":
+			return "unknown";
+		default:
+			return "unknown";
+	}
+}
+
+function metadataForChannel(channel: BuildChannel): BuildMetadata {
+	switch (channel) {
+		case "release":
+			return { channel, label: "release build" };
+		case "dev":
+			return { channel, label: "dev build" };
+		case "local-source":
+			return { channel, label: "local source" };
+		case "package-install":
+			return { channel, label: "package install" };
+		case "compiled":
+			return { channel, label: "compiled build" };
+		case "unknown":
+			return { channel, label: "build unknown" };
+	}
+}
+
+function isLocalSourceTree(startDir: string): boolean {
+	let current = path.resolve(startDir);
+	while (true) {
+		if (hasRepoMarkers(current)) return true;
+		const parent = path.dirname(current);
+		if (parent === current) return false;
+		current = parent;
+	}
+}
+
+function hasRepoMarkers(dir: string): boolean {
+	if (!REPO_MARKERS.every(marker => fs.existsSync(path.join(dir, marker)))) return false;
+	return readPackageName(path.join(dir, "package.json")) === SOURCE_REPO_PACKAGE_NAME;
+}
+
+function readPackageName(packageJsonPath: string): string | undefined {
+	try {
+		const parsed: unknown = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+		if (typeof parsed !== "object" || parsed === null || !("name" in parsed)) return undefined;
+		const name = parsed.name;
+		return typeof name === "string" ? name : undefined;
+	} catch {
+		return undefined;
+	}
+}

package/src/config/keybindings.ts

@@ -188,11 +188,11 @@ export const KEYBINDINGS = {
 	},
 	"app.session.delete": {
 		defaultKeys: "ctrl+d",
-		description: "Delete session",
+		description: "Delete current session transcript/artifacts",
 	},
 	"app.session.deleteNoninvasive": {
 		defaultKeys: "ctrl+backspace",
-		description: "Delete session (non-invasive)",
+		description: "Delete selected session transcript/artifacts (non-invasive)",
 	},
 	"app.tree.foldOrUp": {
 		defaultKeys: ["ctrl+left", "alt+left"],

package/src/eval/js/executor.ts

@@ -1,6 +1,7 @@
 import { DEFAULT_MAX_BYTES, OutputSink } from "../../session/streaming-output";
 import type { ToolSession } from "../../tools";
 import { resolveOutputMaxColumns, resolveOutputSinkHeadBytes } from "../../tools/output-meta";
+import { ToolError } from "../../tools/tool-errors";
 import { executeInVmContext, type JsDisplayOutput } from "./context-manager";
 
 export interface JsExecutorOptions {
@@ -117,7 +118,12 @@ export async function executeJs(code: string, options: JsExecutorOptions): Promi
 				displayOutputs,
 			};
 		}
-		const message = error instanceof Error ? (error.stack ?? error.message) : String(error);
+		const message =
+			error instanceof ToolError || (error instanceof Error && error.name === "ToolError")
+				? error.message
+				: error instanceof Error
+					? (error.stack ?? error.message)
+					: String(error);
 		outputSink.push(message);
 		const summary = await outputSink.dump();
 		return {

package/src/modes/components/hook-selector.ts

@@ -434,6 +434,10 @@ export class HookSelectorComponent extends Container {
 		this.#updateList();
 	}
 
+	hasActiveInlineInput(): boolean {
+		return this.#inlineEditor !== undefined;
+	}
+
 	#updateList(): void {
 		if (this.#wrapFocused && this.#focusAwareList) {
 			this.#focusAwareList.setState(this.#options, this.#selectedIndex, this.#maxVisible);

package/src/modes/components/session-selector.ts

@@ -180,7 +180,7 @@ class SessionList implements Component {
 
 		// Add keybinding hint
 		lines.push("");
-		lines.push(theme.fg("muted", "  [Del to delete, Enter to select, Esc to cancel]"));
+		lines.push(theme.fg("muted", "  [Del to delete selected transcript/artifacts, Enter to select, Esc to cancel]"));
 
 		return lines;
 	}
@@ -307,7 +307,7 @@ export class SessionSelectorComponent extends Container {
 	#showDeleteConfirmation(session: SessionInfo): void {
 		const displayName = session.title || session.firstMessage.slice(0, 40) || session.id;
 		this.#confirmationDialog = new HookSelectorComponent(
-			`Delete session?\n${displayName}`,
+			`Delete selected session transcript and artifacts?\n${displayName}\nThis cannot be undone. Other sessions and topic/history metadata are not deleted.`,
 			["Yes", "No"],
 			async (option: string) => {
 				if (option === "Yes" && this.#onDelete) {

package/src/modes/components/status-line.ts

@@ -929,11 +929,8 @@ export class StatusLineComponent implements Component {
 		const totalWidth = () => leftWidth + rightWidth + (left.length > 0 && right.length > 0 ? 1 : 0);
 
 		if (topFillWidth > 0) {
-			while (totalWidth() > topFillWidth && right.length > 0) {
-				right.pop();
-				rightWidth = this.#groupWidth(right, rightCapWidth, rightSepWidth);
-			}
-			// Shrink path before dropping left segments — path is the only elastic segment
+			// Shrink path before dropping right-side telemetry — path is the only elastic segment,
+			// and presets such as default-usage should not hide usage just because cwd is long.
 			const pathIdx = leftIds.indexOf("path");
 			if (pathIdx >= 0 && totalWidth() > topFillWidth) {
 				const overflow = totalWidth() - topFillWidth;
@@ -943,6 +940,10 @@ export class StatusLineComponent implements Component {
 					leftWidth = this.#groupWidth(left, leftCapWidth, leftSepWidth);
 				}
 			}
+			while (totalWidth() > topFillWidth && right.length > 0) {
+				right.pop();
+				rightWidth = this.#groupWidth(right, rightCapWidth, rightSepWidth);
+			}
 			while (totalWidth() > topFillWidth && left.length > 0) {
 				left.pop();
 				leftIds.pop();

package/src/modes/components/welcome.ts

@@ -1,5 +1,6 @@
 import { type Component, padding, TERMINAL, truncateToWidth, visibleWidth } from "@gajae-code/tui";
 import { APP_NAME } from "@gajae-code/utils";
+import { formatBuildLabel } from "../../build-metadata";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 
 export interface RecentSession {
@@ -19,6 +20,7 @@ export interface WelcomeComponentOptions {
 	getReservedBottomRows?: (termWidth: number) => number;
 	changelogMarkdown?: string;
 	collapseChangelog?: boolean;
+	buildLabel?: string;
 }
 
 const WELCOME_STATIC_RIGHT_ROWS_EXCLUDING_DYNAMIC_SECTIONS = 9;
@@ -227,7 +229,8 @@ export class WelcomeComponent implements Component {
 		const br = theme.fg("dim", theme.boxRound.bottomRight);
 
 		const lines: string[] = [];
-		const title = ` ${APP_NAME} v${this.version} · GJC Forge `;
+		const buildLabel = this.options.buildLabel ?? formatBuildLabel();
+		const title = ` ${APP_NAME} v${this.version} · ${buildLabel} · GJC Forge `;
 		const titlePrefixRaw = hChar.repeat(3);
 		const titleStyled = theme.fg("dim", titlePrefixRaw) + theme.fg("muted", title);
 		const titleVisLen = visibleWidth(titlePrefixRaw) + visibleWidth(title);

package/src/modes/controllers/command-controller.ts

@@ -567,7 +567,7 @@ export class CommandController {
 			`| Start a fresh session | \`${sessionNewKey}\` or \`/new\` |`,
 			"| Resume another session | `/resume` |",
 			"| Show session details | `/session info` |",
-			"| Delete current session | `/session delete` |",
+			"| Delete current session transcript/artifacts | `/session delete` |",
 			"| Select a model | `/model` or `Ctrl+L` |",
 			"| Show all shortcuts | `?` on an empty prompt or `/hotkeys` |",
 			"",

package/src/modes/controllers/input-controller.ts

@@ -149,6 +149,12 @@ export class InputController {
 				return { consume: true };
 			}
 			const hookDialogActive = this.#hasHookDialog();
+			if (this.ctx.hookSelector?.hasActiveInlineInput?.() === true) {
+				// Inline ask/custom-input editors use Esc to return to the option list.
+				// Let the focused selector see the key instead of converting a typo
+				// into a full workflow/session abort while the agent is streaming.
+				return undefined;
+			}
 			if (
 				this.#handleCancellableWorkEscape({
 					loading: hookDialogActive,

package/src/modes/controllers/selector-controller.ts

@@ -1431,8 +1431,12 @@ export class SelectorController {
 		}
 
 		const confirmed = await this.ctx.showHookConfirm(
-			"Delete Session",
-			"This will permanently delete the current session.\nYou will be returned to the session selector.",
+			"Delete current session transcript and artifacts?",
+			[
+				"This permanently deletes only the current session transcript file and its artifacts directory.",
+				"Other sessions and topic/history metadata are not deleted.",
+				"You will be moved to a fresh session and returned to the session selector.",
+			].join("\n"),
 		);
 
 		if (!confirmed) {
@@ -1449,7 +1453,7 @@ export class SelectorController {
 		await storage.deleteSessionWithArtifacts(sessionFile);
 
 		// Show session selector
-		this.ctx.showStatus("Session deleted");
+		this.ctx.showStatus("Current session transcript and artifacts deleted");
 		await this.showSessionSelector();
 	}
 

package/src/modes/rpc/rpc-client.ts

@@ -8,7 +8,8 @@ import type { CompactionResult } from "@gajae-code/agent-core/compaction";
 import type { ImageContent, Model } from "@gajae-code/ai";
 import { isRecord, ptree, readJsonl } from "@gajae-code/utils";
 import type { BashResult } from "../../exec/bash-executor";
-import type { SessionStats } from "../../session/agent-session";
+import type { AgentSessionEvent, SessionStats } from "../../session/agent-session";
+import { AGENT_WIRE_EVENT_TYPES, type AgentWireEventType } from "../shared/agent-wire/event-contract";
 import type {
 	RpcCommand,
 	RpcExtensionUIRequest,
@@ -64,6 +65,7 @@ export interface RpcClientOptions {
 export type ModelInfo = Pick<Model, "provider" | "id" | "contextWindow" | "reasoning" | "thinking">;
 
 export type RpcEventListener = (event: AgentEvent) => void;
+export type RpcSessionEventListener = (event: AgentSessionEvent) => void;
 
 export interface RpcClientToolContext<TDetails = unknown> {
 	toolCallId: string;
@@ -91,7 +93,8 @@ export function defineRpcClientTool<
 	return tool;
 }
 
-const agentEventTypes = new Set<AgentEvent["type"]>([
+const agentWireEventTypes = new Set<AgentWireEventType>(AGENT_WIRE_EVENT_TYPES);
+const coreAgentEventTypes = new Set<AgentEvent["type"]>([
 	"agent_start",
 	"agent_end",
 	"turn_start",
@@ -116,13 +119,16 @@ function isRpcResponse(value: unknown): value is RpcResponse {
 	return true;
 }
 
-function isAgentEvent(value: unknown): value is AgentEvent {
+function isAgentSessionEvent(value: unknown): value is AgentSessionEvent {
 	if (!isRecord(value)) return false;
 	const type = value.type;
 	if (typeof type !== "string") return false;
-	return agentEventTypes.has(type as AgentEvent["type"]);
+	return agentWireEventTypes.has(type as AgentWireEventType);
 }
 
+function isCoreAgentEvent(value: AgentSessionEvent): value is AgentEvent {
+	return coreAgentEventTypes.has(value.type as AgentEvent["type"]);
+}
 function isRpcHostToolCallRequest(value: unknown): value is RpcHostToolCallRequest {
 	if (!isRecord(value)) return false;
 	return (
@@ -378,6 +384,7 @@ export class RpcClient {
 	#transport: RpcTransport | null = null;
 	#transportClosed = false;
 	#eventListeners: RpcEventListener[] = [];
+	#sessionEventListeners: RpcSessionEventListener[] = [];
 	#pendingRequests: Map<string, { resolve: (response: RpcResponse) => void; reject: (error: Error) => void }> =
 		new Map();
 	#customTools: RpcClientCustomTool[] = [];
@@ -442,7 +449,7 @@ export class RpcClient {
 	}
 
 	/**
-	 * Subscribe to agent events.
+	 * Subscribe to the legacy core AgentEvent subset.
 	 */
 	onEvent(listener: RpcEventListener): () => void {
 		this.#eventListeners.push(listener);
@@ -454,6 +461,19 @@ export class RpcClient {
 		};
 	}
 
+	/**
+	 * Subscribe to all renderer-facing agent session events.
+	 */
+	onSessionEvent(listener: RpcSessionEventListener): () => void {
+		this.#sessionEventListeners.push(listener);
+		return () => {
+			const index = this.#sessionEventListeners.indexOf(listener);
+			if (index !== -1) {
+				this.#sessionEventListeners.splice(index, 1);
+			}
+		};
+	}
+
 	/**
 	 * Subscribe to workflow lifecycle gates emitted by RPC mode.
 	 */
@@ -928,8 +948,12 @@ export class RpcClient {
 
 		// Canonical agent-wire event frame: { type:"event", payload:{ event_type, event } }.
 		const event = unwrapAgentWireEventFrame(data);
-		if (!isAgentEvent(event)) return;
+		if (!isAgentSessionEvent(event)) return;
 
+		for (const listener of this.#sessionEventListeners) {
+			listener(event);
+		}
+		if (!isCoreAgentEvent(event)) return;
 		for (const listener of this.#eventListeners) {
 			listener(event);
 		}

package/src/notifications/telegram-daemon.ts

@@ -146,6 +146,7 @@ const TYPING_REFRESH_INTERVAL_MS = 4_000;
 const QUEUED_REACTION = "👀";
 const PENDING_TOPIC_FRAME_LIMIT = 20;
 const SEEN_UPDATE_ID_LIMIT = 1_000;
+const ORPHAN_TOPIC_GRACE_MS = 60_000;
 const CONSUMED_REACTION = "✅";
 
 function splitTelegramPlainText(text: string, max = TELEGRAM_MESSAGE_LIMIT): string[] {
@@ -1414,24 +1415,33 @@ export class TelegramNotificationDaemon {
 	async scanRoots(): Promise<void> {
 		const paths = daemonPaths(this.opts.settings.getAgentDir());
 		const rootState = await readJson<{ roots?: string[] }>(this.fsImpl, paths.roots);
+		const endpointSessionIds = new Set<string>();
+		let allRootsReadable = true;
 		for (const root of rootState?.roots ?? []) {
 			const dir = path.join(root, "notifications");
 			let files: string[];
 			try {
 				files = await this.fsImpl.readdir(dir);
 			} catch {
+				allRootsReadable = false;
 				continue;
 			}
 			for (const file of files.filter(item => item.endsWith(".json"))) {
 				const sessionId = path.basename(file, ".json");
+				endpointSessionIds.add(sessionId);
 				if (this.sessions.has(sessionId)) continue;
 				try {
 					const endpoint = readEndpoint(path.join(dir, file));
 					// Skip endpoint files whose owning process is gone or that are
 					// explicitly stale (e.g. a hard-closed session): reconnecting
-					// would chase a dead, token-bearing record forever.
+					// would chase a dead, token-bearing record forever. Once the
+					// associated topic is past the grace window, reap it through the
+					// same best-effort delete path as graceful session shutdown.
 					const pidAlive = this.opts.pidAlive ?? defaultPidAlive;
-					if (endpoint.stale || (endpoint.pid !== undefined && !pidAlive(endpoint.pid))) continue;
+					if (endpoint.stale || (endpoint.pid !== undefined && !pidAlive(endpoint.pid))) {
+						await this.deleteOrphanedTopic(sessionId);
+						continue;
+					}
 					const endpointKey = endpointGenerationKey(endpoint.url, endpoint.token);
 					if (this.closedEndpointKeys.get(sessionId) === endpointKey) continue;
 					this.closedEndpointKeys.delete(sessionId);
@@ -1439,6 +1449,12 @@ export class TelegramNotificationDaemon {
 				} catch {}
 			}
 		}
+		if (allRootsReadable) {
+			for (const sessionId of this.topics.sessionIds()) {
+				if (!this.sessions.has(sessionId) && !endpointSessionIds.has(sessionId))
+					await this.deleteOrphanedTopic(sessionId);
+			}
+		}
 	}
 
 	connectSession(sessionId: string, url: string, token: string): void {
@@ -1683,6 +1699,16 @@ export class TelegramNotificationDaemon {
 		}
 	}
 
+	private topicPastOrphanGrace(sessionId: string): boolean {
+		const record = this.topics.get(sessionId);
+		return record !== undefined && this.runtime.now() - record.createdAt >= ORPHAN_TOPIC_GRACE_MS;
+	}
+
+	private async deleteOrphanedTopic(sessionId: string): Promise<void> {
+		if (!this.topicPastOrphanGrace(sessionId)) return;
+		await this.deleteTopic(sessionId);
+	}
+
 	/** Best-effort delete of a session topic once its local notification endpoint shuts down. */
 	private async deleteTopic(sessionId: string): Promise<void> {
 		const record = this.topics.get(sessionId);

package/src/slash-commands/builtin-registry.ts

@@ -810,12 +810,12 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 	{
 		name: "session",
 		priority: 88,
-		description: "Show current session info or delete current session",
+		description: "Show session info or delete the current session transcript/artifacts",
 		acpDescription: "Show session information",
 		acpInputHint: "info|delete",
 		subcommands: [
 			{ name: "info", description: "Show current session id, title, and workspace" },
-			{ name: "delete", description: "Delete current session and return to selector" },
+			{ name: "delete", description: "Delete current session transcript and artifacts" },
 		],
 		allowArgs: true,
 		handle: async (command, runtime) => {
@@ -844,7 +844,10 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 					return usage(`Failed to delete session: ${errorMessage(err)}`, runtime);
 				}
 				await runtime.output(
-					`Session deleted: ${sessionFile}. Use ACP \`session/load\` to switch to another session.`,
+					[
+						`Deleted current session transcript and artifacts: ${sessionFile}`,
+						"Other sessions and topic/history metadata were not deleted.",
+					].join("\n"),
 				);
 				return commandConsumed();
 			}
@@ -1020,8 +1023,10 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 				return commandConsumed();
 			}
 			if (args === "login" || args.startsWith("login ")) {
+				const providerId = args.slice("login".length).trim();
+				const loginCommand = providerId ? `/login ${providerId}` : "/login [provider-id]";
 				await runtime.output(
-					"Use the terminal UI /login selector for browser, device-code, or manual callback provider login.",
+					`Open the terminal UI and run ${loginCommand} for OAuth/subscription account login. Paste callbacks with /login <redirect URL or code>.`,
 				);
 				return commandConsumed();
 			}