Skip to content

Keep the Claude session Switchboard was started from out of new sessions #111

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
vivi7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep the Claude session Switchboard was started from out of new sessions #111

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
27 changes: 25 additions & 2 deletions pty-env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Environment for PTY children.
//
// Two jobs:
// Three jobs:
//
// 1. Strip Electron internals that cause nested Electron apps (or node-pty
// inside them) to malfunction.
Expand All @@ -19,14 +19,37 @@

const LOCALE_VARS = ['LC_ALL', 'LC_CTYPE', 'LANG'];

// 3. Forget the Claude Code session Switchboard itself may have been started
// from (a terminal inside a session, or a session restarting the app).
// Claude passes these to every child; a CLI started with them takes itself
// for a child of that old session: it writes no transcript of its own, so
// the new session gets no title, no row and nothing to resume. Settings a
// user puts in env (CLAUDE_CODE_MAX_OUTPUT_TOKENS, …) are kept.
const INHERITED_CLAUDE_SESSION_VARS = new Set([
'CLAUDECODE',
'CLAUDE_PID',
'CLAUDE_EFFORT',
'CLAUDE_CODE_ENTRYPOINT',
'CLAUDE_CODE_EXECPATH',
'CLAUDE_CODE_SESSION_ID',
'CLAUDE_CODE_CHILD_SESSION',
'CLAUDE_CODE_SESSION_ATTENDED',
'CLAUDE_CODE_BRIDGE_SESSION_ID',
'CLAUDE_CODE_MESSAGING_TOKEN',
'CLAUDE_CODE_MESSAGING_SOCKET',
// The IDE server of that session; Switchboard sets its own for --ide.
'CLAUDE_CODE_SSE_PORT',
]);

function buildPtyEnv(sourceEnv) {
const env = Object.fromEntries(
Object.entries(sourceEnv).filter(([k]) =>
!k.startsWith('ELECTRON_') &&
!k.startsWith('GOOGLE_API_KEY') &&
k !== 'NODE_OPTIONS' &&
k !== 'ORIGINAL_XDG_CURRENT_DESKTOP' &&
k !== 'WT_SESSION'
k !== 'WT_SESSION' &&
!INHERITED_CLAUDE_SESSION_VARS.has(k)
)
);

Expand Down
16 changes: 16 additions & 0 deletions test/pty-env.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,19 @@ test('an empty locale value counts as absent', () => {
// an empty string gives pbcopy nothing to work with either.
assert.equal(buildPtyEnv({ LANG: '' }).LC_CTYPE, 'UTF-8');
});

test('a Claude Code session Switchboard was started from is not passed on', () => {
// Restarting the app from inside a session leaves these in its environment;
// a CLI that inherits them takes itself for a child and writes no transcript.
const env = buildPtyEnv({
PATH: '/usr/bin', LANG: 'en_US.UTF-8',
CLAUDECODE: '1', CLAUDE_PID: '42', CLAUDE_EFFORT: 'high',
CLAUDE_CODE_ENTRYPOINT: 'cli', CLAUDE_CODE_EXECPATH: '/x/claude',
CLAUDE_CODE_SESSION_ID: 'parent', CLAUDE_CODE_CHILD_SESSION: '1', CLAUDE_CODE_SESSION_ATTENDED: '1',
CLAUDE_CODE_BRIDGE_SESSION_ID: 'b', CLAUDE_CODE_MESSAGING_TOKEN: 't', CLAUDE_CODE_MESSAGING_SOCKET: '/tmp/s',
CLAUDE_CODE_SSE_PORT: '1234',
// What the user configured stays.
CLAUDE_CODE_MAX_OUTPUT_TOKENS: '64000', CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS: '1', CLAUDE_CONFIG_DIR: '/cfg',
});
assert.deepEqual(Object.keys(env).sort(), ['CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS', 'CLAUDE_CODE_MAX_OUTPUT_TOKENS', 'CLAUDE_CONFIG_DIR', 'LANG', 'PATH']);
});
Loading