Skip to content

fix: herdr セッション一覧に作業ディレクトリを表示 #132

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
dashi296 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: herdr セッション一覧に作業ディレクトリを表示 #132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcc3f90
fix: herdr セッション一覧に作業ディレクトリを表示
dashi296 Jul 9, 2026
de1e78f
fix: herdr pane list のパース失敗時にセッション一覧が消える退行を修正
dashi296 Jul 10, 2026
f54ea8a
fix: herdr セッションが複数ある場合に誤った workingDirectory を表示しない
dashi296 Jul 10, 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
33 changes: 21 additions & 12 deletions packages/desktop/src/main/pty-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,20 +1084,29 @@ export async function getMultiplexerSessions(): Promise<MultiplexerSessionInfo[]
}

async function collectHerdr(): Promise<MultiplexerSessionInfo[]> {
const results: MultiplexerSessionInfo[] = []
const { stdout } = await execAsync('herdr session list --json', { env: EXEC_ENV })
const parsed = JSON.parse(stdout)
const [sessionResult, paneResult] = await Promise.all([
execAsync('herdr session list --json', { env: EXEC_ENV }),
execAsync('herdr pane list', { env: EXEC_ENV }).catch(() => null),
])

const parsed = JSON.parse(sessionResult.stdout)
const sessions: Array<{ name: string; running: boolean; session_dir?: string }> =
Array.isArray(parsed) ? parsed : parsed.sessions ?? []
for (const s of sessions) {
if (!s.name || !SAFE_SESSION_NAME_RE.test(s.name)) continue
results.push({
tool: 'herdr',
sessionName: s.name,
detail: s.running ? 'running' : 'stopped',
})
}
return results

let paneCwd: string | undefined
try {
if (paneResult) {
paneCwd = (JSON.parse(paneResult.stdout)?.result?.panes as Array<{ cwd?: string }> | undefined)?.[0]?.cwd
}
} catch { /* pane list parse failure — proceed without workingDirectory */ }

const validSessions = sessions.filter((s) => s.name && SAFE_SESSION_NAME_RE.test(s.name))
return validSessions.map((s) => ({
tool: 'herdr' as const,
sessionName: s.name,
detail: s.running ? 'running' : 'stopped',
workingDirectory: validSessions.length === 1 ? paneCwd : undefined,
}))
}

const collectors: Record<MultiplexerKind, () => Promise<MultiplexerSessionInfo[]>> = {
Expand Down
Loading