Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions src/upkeep.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { spawn } from 'node:child_process';
import { join } from 'node:path';
import { homedir } from 'node:os';
import { readJson, writeJsonAtomic, cacheDir } from './util/state.js';
import { homeFolderRefusal } from './init-guard.js';
import { HOSTS, hostRelPath } from './hosts/registry.js';
import { markersFor } from './hosts/sections.js';
import { getNpmViewVersion, readCurrentVersion } from './cli-meta.js';
Expand Down Expand Up @@ -288,9 +289,18 @@ export function reconcileWiring(
wired?: (repo: string) => string[];
rewrite: (repo: string, hosts: string[], opts: WiringOpts, toTrail: boolean) => void;
toTrail?: (repo: string) => boolean;
/** Overrides homedir() in tests. */
home?: string;
},
): WiringRefresh | null {
try {
// #829: user-scope agent wiring (~/.claude/helpers, ~/.claude/skills, the
// graft MCP entry) makes the home folder look like a wired repository, and
// a version-change upkeep would then refresh ~ — deleting user-scope
// helpers and skills and disabling the graft MCP server with nothing
// registered in its place. The home folder is not a repository; the same
// refusal `init` already gives, applied before anything is read or written.
if (homeFolderRefusal(repo, deps.home) !== null) return null;
const stamp = readStamp(repo);
const toTrail = deps.toTrail?.(repo) ?? false;
if (stamp && stamp.version === current && !toTrail) return null;
Expand Down
43 changes: 43 additions & 0 deletions test/upkeep.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,46 @@ test('formatWiringRefresh discloses machine-wide writes', () => {
assert.ok(local);
assert.doesNotMatch(local, /~\/\.codex/);
});

/*
* Issue #829: user-scope agent wiring (~/.claude/helpers/*.cjs, ~/.claude/
* skills, the graft MCP entry in ~/.claude.json) made the home folder look
* like a wired repository, so a version-change upkeep ran a full wiring
* refresh against ~ — deleting user-scope helpers and skills and disabling
* the graft MCP server with nothing registered in its place. The home folder
* is not a repository; reconcileWiring must refuse it no matter what its disk
* looks like, while a real repo under the same home keeps refreshing.
*/
test("reconcileWiring refuses the home folder: user-scope wiring is not a repo (#829)", () => {
const home = tmpRepo("upkeep-home-folder");
mkdirSync(join(home, ".claude", "helpers"), { recursive: true });
const helper = join(home, ".claude", "helpers", "graft-hooks.cjs");
writeFileSync(helper, "module.exports = {}; // user-scope wiring, not a repo's");

let rewrote = 0;
const refreshed = reconcileWiring(home, "9.9.9", { rewrite: () => { rewrote++; }, home });
assert.equal(refreshed, null, "home is not a repository — nothing to reconcile");
assert.equal(rewrote, 0, "no wiring rewrite ran against the home folder");
assert.ok(existsSync(helper), "the user-scope helper survives upkeep");
});

test("a home stamped by an older version stays refused on upgrade (#829)", () => {
const home = tmpRepo("upkeep-home-stamped");
mkdirSync(join(home, ".trail"), { recursive: true });
writeStamp(home, "0.28.0", ["claude"], { global: false, hooks: true });
let rewrote = 0;
const refreshed = reconcileWiring(home, "0.29.0", { rewrite: () => { rewrote++; }, home });
assert.equal(refreshed, null, "an init-wired home must not refresh either — the guard is positional, not stamp-based");
assert.equal(rewrote, 0);
});

test("a real repository under the same home still refreshes (#829)", () => {
const home = tmpRepo("upkeep-home-parent");
const repo = join(home, "code", "assign");
mkdirSync(join(repo, ".trail"), { recursive: true });
writeFileSync(join(repo, ".trail", "hook.cjs"), "");
let rewrote = 0;
const refreshed = reconcileWiring(repo, "9.9.9", { rewrite: () => { rewrote++; }, home });
assert.ok(refreshed, "the guard is positional: only ~ itself is refused");
assert.equal(rewrote, 1, "and the refresh really ran");
});