Skip to content

fix(hook): resolve Claude transcript by session id #1415

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

Open
rNoz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(hook): resolve Claude transcript by session id #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 13 additions & 28 deletions apps/hook/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ import {
findSessionLogsForCwd,
getRecentRenderedMessages,
resolveDroidSessionLogForCwd,
resolveSessionLogByAncestorPids,
resolveSessionLogByCwdScan,
resolveClaudeSessionLog,
type RenderedMessage,
} from "./session-log";
import { findCodexRolloutByThreadId, getLatestCodexPlan, getRecentCodexMessages } from "./codex-session";
Expand Down Expand Up @@ -1448,19 +1447,8 @@ if (args[0] === "sessions") {
} else {
// Claude Code path: resolve session log
//
// Strategy (most precise → least precise):
// 1. Ancestor-PID session metadata: walk up the process tree checking
// ~/.claude/sessions/<pid>.json at each hop. When invoked from a slash
// command's `!` bang, the direct parent is a bash subshell — Claude's
// session file is a few hops up. Deterministic when it matches.
// 2. Cwd-scan of session metadata: read every ~/.claude/sessions/*.json,
// filter by cwd, pick the most recent startedAt. Better than mtime
// guessing because it uses session-level metadata.
// 3. CWD slug match (mtime-based): legacy behavior — picks the most
// recently modified jsonl in the project dir. Fragile when multiple
// sessions exist for the same project.
// 4. Ancestor directory walk: handles the case where the user `cd`'d
// deeper into a subdirectory after session start.
// Prefer precise session metadata. Heuristic cwd/ancestor fallbacks are
// only safe when no metadata identifies the invoking session.

if (process.env.PLANNOTATOR_DEBUG) {
console.error(`[DEBUG] Project root: ${projectRoot}`);
Expand Down Expand Up @@ -1489,19 +1477,16 @@ if (args[0] === "sessions") {
}
}

// 1. Walk ancestor PIDs for a matching session metadata file
const ancestorLog = resolveSessionLogByAncestorPids();
tryLogCandidates("Ancestor PID session metadata", () => ancestorLog ? [ancestorLog] : []);

// 2. Scan all session metadata files for one whose cwd matches
const cwdScanLog = resolveSessionLogByCwdScan({ cwd: projectRoot });
tryLogCandidates("Cwd-scan session metadata", () => cwdScanLog ? [cwdScanLog] : []);

// 3. Fall back to CWD slug match (mtime-based)
tryLogCandidates("CWD slug match (mtime)", () => findSessionLogsForCwd(projectRoot));

// 4. Fall back to ancestor directory walk
tryLogCandidates("Directory ancestor walk", () => findSessionLogsByAncestorWalk(projectRoot));
const resolution = resolveClaudeSessionLog({ cwd: projectRoot });
if (resolution.status === "identified") {
tryLogCandidates(
`Claude session metadata (${resolution.source})`,
() => resolution.logPath ? [resolution.logPath] : [],
);
} else if (resolution.status === "unavailable") {
tryLogCandidates("CWD slug match (mtime)", () => findSessionLogsForCwd(projectRoot));
tryLogCandidates("Directory ancestor walk", () => findSessionLogsByAncestorWalk(projectRoot));
}
}

if (!lastMessage) {
Expand Down
Loading