fix: keep a home value that is not a path off disk, and re-apply from the own home (release review)

getCustomModelForPersist() trusted homeEnvVar to name a path, but the registry
types it as any env name, so a clis.json override could write a session's own
credential to state.json. Only an absolute path is written now.

A re-apply resolved the CLI's real home from what the session's map held, which
under a selection is the injected directory, and recovery resolved none at all.
An entry the own home lacks (settings.yaml) was then linked from the server's
home on an endpoint switch and on recovery. The route now reads the new
Session.ownEnvValue(), and recovery reads the clamped record through the same
bounded guard, under the bulk cap since it walks every saved session. Also
corrects the comment that said only a removed directory gets its links again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Codeman maintainer committed 2026-11-06 02:39:11 +01:00
1 parent 10d43b993e
commit db5222c4fa
9 files changed
+149 -27

No files matched your search

+16 -3
View File
@@ -29,7 +29,7 @@
*/
import { EventEmitter } from 'node:events';
import { basename } from 'node:path';
import { basename, isAbsolute } from 'node:path';
import { realpath } from 'node:fs/promises';
import { execSync, execFileSync } from 'node:child_process';
import { v4 as uuidv4 } from 'uuid';
@@ -1374,6 +1374,17 @@ export class Session extends EventEmitter {
return value && value.trim() ? value.trim() : undefined;
}
/**
* What the SESSION itself set for `key`, same single-key rule. `envOverrideValue()` answers
* with whatever the map holds, which under a selection is the injected value: a re-apply
* resolving the CLI's real home must read the session's own home, or none.
*/
ownEnvValue(key: string): string | undefined {
const selection = this._customModel;
const value = selection?.envKeys.includes(key) ? selection.ownEnv?.[key] : this._envOverrides?.[key];
return value?.trim() || undefined;
}
/** Owning username in multi-user mode, else undefined. */
get owner(): string | undefined {
return this._owner;
@@ -2003,7 +2014,9 @@ export class Session extends EventEmitter {
* The one value it does carry is the session's own home directory (`ownEnv`, narrowed to
* `homeEnvVar`), a path like `configDir` beside it: the selection overwrote the tmux
* `setenv` that held it, so without this a clear after a restart would lose it. Any other
* entry of `ownEnv` may be a credential and stays in memory.
* entry of `ownEnv` may be a credential and stays in memory, and so does a `homeEnvVar`
* value that is not an absolute path: the registry types that name as any env var, so a
* `clis.json` override can point it at a credential.
*/
getCustomModelForPersist(): CustomModelBookkeeping | undefined {
if (!this._customModel) return undefined;
@@ -2013,7 +2026,7 @@ export class Session extends EventEmitter {
return {
...selection,
envKeys: [...selection.envKeys],
...(homeEnvVar && ownHome ? { ownEnv: { [homeEnvVar]: ownHome } } : {}),
...(homeEnvVar && ownHome && isAbsolute(ownHome) ? { ownEnv: { [homeEnvVar]: ownHome } } : {}),
};
}