xtrm-cli 2.1.28 → 2.1.29

package/extensions/beads.ts

@@ -10,10 +10,12 @@ export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 	const isBeadsProject = (cwd: string) => fs.existsSync(path.join(cwd, ".beads"));
 
-	// Pin session to PID — stable for the life of the Pi process, consistent across all extension handlers
-	const sessionId = process.pid.toString();
+	// Get session ID from sessionManager (UUID, consistent with hooks)
+	const getSessionId = (ctx: any): string => {
+		return ctx.sessionManager?.getSessionId?.() ?? process.pid.toString();
+	};
 
-	const getSessionClaim = async (cwd: string): Promise<string | null> => {
+	const getSessionClaim = async (sessionId: string, cwd: string): Promise<string | null> => {
 		const result = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${sessionId}`], { cwd });
 		if (result.code === 0) return result.stdout.trim();
 		return null;
@@ -36,8 +38,10 @@ export default function (pi: ExtensionAPI) {
 		const cwd = getCwd(ctx);
 		if (!isBeadsProject(cwd)) return undefined;
 
+		const sessionId = getSessionId(ctx);
+
 		if (EventAdapter.isMutatingFileTool(event)) {
-			const claim = await getSessionClaim(cwd);
+			const claim = await getSessionClaim(sessionId, cwd);
 			if (!claim) {
 			    const hasWork = await hasTrackableWork(cwd);
 			    if (hasWork) {
@@ -46,7 +50,7 @@ export default function (pi: ExtensionAPI) {
 			        }
 			        return {
                         block: true,
-                        reason: `No active issue claim for this session (pid:${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
+                        reason: `No active issue claim for this session (${sessionId}).\n  bd update <id> --claim`,
                     };
                 }
             }
@@ -55,7 +59,7 @@ export default function (pi: ExtensionAPI) {
 		if (isToolCallEventType("bash", event)) {
 			const command = event.input.command;
 			if (command && /\bgit\s+commit\b/.test(command)) {
-                const claim = await getSessionClaim(cwd);
+                const claim = await getSessionClaim(sessionId, cwd);
 				if (claim) {
 					return {
                         block: true,
@@ -71,16 +75,15 @@ export default function (pi: ExtensionAPI) {
 	pi.on("tool_result", async (event, ctx) => {
 		if (isBashToolResult(event)) {
 			const command = event.input.command;
+			const sessionId = getSessionId(ctx);
 
-			// Auto-claim on bd update --claim regardless of exit code.
-			// bd returns exit 1 with "already in_progress" when status unchanged — still a valid claim intent.
 			if (command && /\bbd\s+update\b/.test(command) && /--claim\b/.test(command)) {
 				const issueMatch = command.match(/\bbd\s+update\s+(\S+)/);
 				if (issueMatch) {
 					const issueId = issueMatch[1];
 					const cwd = getCwd(ctx);
 					await SubprocessRunner.run("bd", ["kv", "set", `claimed:${sessionId}`, issueId], { cwd });
-					const claimNotice = `\n\n✅ **Beads**: Session \`pid:${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
+					const claimNotice = `\n\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
 					return { content: [...event.content, { type: "text", text: claimNotice }] };
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-cli",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "main": "./dist/index.js",
   "type": "module",

package/src/commands/install-pi.ts

@@ -14,6 +14,18 @@ interface SchemaField { key: string; label: string; hint: string; secret: boolea
 interface OAuthProvider { key: string; instruction: string; }
 interface InstallSchema { fields: SchemaField[]; oauth_providers: OAuthProvider[]; packages: string[]; }
 
+export const EXTRA_PI_CONFIGS = ['pi-worktrees-settings.json'];
+
+export async function copyExtraConfigs(srcDir: string, destDir: string): Promise<void> {
+    for (const name of EXTRA_PI_CONFIGS) {
+        const src = path.join(srcDir, name);
+        const dest = path.join(destDir, name);
+        if (await fs.pathExists(src) && !await fs.pathExists(dest)) {
+            await fs.copy(src, dest);
+        }
+    }
+}
+
 export function fillTemplate(template: string, values: Record<string, string>): string {
     return template.replace(/\{\{(\w+)\}\}/g, (_, key) => values[key] ?? '');
 }

package/src/commands/install-project.ts

@@ -127,7 +127,7 @@ export async function getAvailableProjectSkills(): Promise<string[]> {
     for (const entry of entries) {
         const entryPath = path.join(PROJECT_SKILLS_DIR, entry);
         const stat = await fs.stat(entryPath);
-        if (stat.isDirectory()) {
+        if (stat.isDirectory() && await fs.pathExists(path.join(entryPath, '.claude'))) {
             skills.push(entry);
         }
     }

package/test/install-pi.test.ts

@@ -51,6 +51,44 @@ describe('createInstallPiCommand', () => {
         expect(settings.packages).toContain('npm:pi-serena-tools');
     });
 
+    it('settings.json.template includes @zenobius/pi-worktrees package', () => {
+        const fs = require('node:fs');
+        const p = require('node:path');
+        const settings = JSON.parse(fs.readFileSync(p.resolve(__dirname, '..', '..', 'config', 'pi', 'settings.json.template'), 'utf8'));
+        expect(settings.packages).toContain('npm:@zenobius/pi-worktrees');
+    });
+
+    it('copyExtraConfigs copies missing files and skips existing ones', async () => {
+        const { copyExtraConfigs, EXTRA_PI_CONFIGS } = await import('../src/commands/install-pi.js?t=copy' + Date.now());
+        const os = require('node:os');
+        const nodePath = require('node:path');
+        const nodeFs = require('node:fs');
+        const srcDir = nodeFs.mkdtempSync(nodePath.join(os.tmpdir(), 'pi-src-'));
+        const destDir = nodeFs.mkdtempSync(nodePath.join(os.tmpdir(), 'pi-dest-'));
+        // Create src file
+        nodeFs.writeFileSync(nodePath.join(srcDir, 'pi-worktrees-settings.json'), '{"worktree":{}}');
+        await copyExtraConfigs(srcDir, destDir);
+        // Should have been copied
+        expect(nodeFs.existsSync(nodePath.join(destDir, 'pi-worktrees-settings.json'))).toBe(true);
+        // Second call should skip (not throw)
+        await copyExtraConfigs(srcDir, destDir);
+        nodeFs.rmSync(srcDir, { recursive: true });
+        nodeFs.rmSync(destDir, { recursive: true });
+    });
+
+    it('EXTRA_PI_CONFIGS includes pi-worktrees-settings.json', async () => {
+        const { EXTRA_PI_CONFIGS } = await import('../src/commands/install-pi.js?t=extra' + Date.now());
+        expect(EXTRA_PI_CONFIGS).toContain('pi-worktrees-settings.json');
+    });
+
+    it('pi-worktrees-settings.json exists in config/pi with worktree.parentDir defined', () => {
+        const fs = require('node:fs');
+        const p = require('node:path');
+        const cfg = JSON.parse(fs.readFileSync(p.resolve(__dirname, '..', '..', 'config', 'pi', 'pi-worktrees-settings.json'), 'utf8'));
+        expect(cfg.worktree).toBeDefined();
+        expect(cfg.worktree.parentDir).toBeDefined();
+    });
+
     it('install-schema.json defines DASHSCOPE_API_KEY and ZAI_API_KEY fields', () => {
         const fs = require('node:fs');
         const p = require('node:path');
@@ -73,7 +111,7 @@ describe('createInstallPiCommand', () => {
         const fs = require('node:fs');
         const p = require('node:path');
         const extDir = p.resolve(__dirname, '..', '..', 'config', 'pi', 'extensions');
-        const files = ['auto-session-name.ts','auto-update.ts','bg-process.ts','compact-header.ts','custom-footer.ts','git-checkpoint.ts','git-guard.ts','safe-guard.ts','todo.ts'];
+        const files = ['auto-session-name.ts','auto-update.ts','bg-process.ts','compact-header.ts','custom-footer.ts','git-checkpoint.ts','todo.ts'];
         for (const f of files) expect(fs.existsSync(p.join(extDir, f))).toBe(true);
     });
 

package/test/install-project.test.ts

@@ -120,13 +120,13 @@ describe('deepMergeHooks', () => {
 describe('extractReadmeDescription', () => {
     it('extracts the first prose line after the title', async () => {
         const readme = await fsExtra.readFile(
-            path.join(__dirname, '../../project-skills/py-quality-gate/README.md'),
+            path.join(__dirname, '../../project-skills/quality-gates/README.md'),
             'utf8',
         );
 
-        expect(extractReadmeDescription(readme)).toBe(
-            'Python quality gate for Claude Code. Runs ruff (linting/formatting) and mypy (type checking) automatically on every file edit.',
-        );
+        const description = extractReadmeDescription(readme);
+        expect(description).toBeTruthy();
+        expect(description).not.toBe('No description available');
     });
 
     it('skips badge blocks and finds the first actual description line', async () => {
@@ -154,12 +154,11 @@ describe('installProjectSkill', () => {
     });
 
     it('copies hook assets required by the installed project skill', async () => {
-        await installProjectSkill('ts-quality-gate', tmpDir);
+        await installProjectSkill('tdd-guard', tmpDir);
 
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'hooks', 'quality-check.cjs'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'hooks', 'hook-config.json'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-ts-quality-gate', 'SKILL.md'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'ts-quality-gate-readme.md'))).toBe(true);
+        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'hooks', 'tdd-guard-pretool-bridge.cjs'))).toBe(true);
+        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-tdd-guard', 'SKILL.md'))).toBe(true);
+        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'tdd-guard-readme.md'))).toBe(true);
     });
 
     it('merges settings without dropping existing project hooks', async () => {
@@ -188,22 +187,22 @@ describe('installProjectSkill', () => {
             type: 'module',
         }, { spaces: 2 });
 
-        await installProjectSkill('ts-quality-gate', tmpDir);
+        await installProjectSkill('tdd-guard', tmpDir);
 
-        const tsRun = spawnSync(
+        const guardRun = spawnSync(
             'node',
-            [path.join(tmpDir, '.claude', 'hooks', 'quality-check.cjs')],
+            [path.join(tmpDir, '.claude', 'hooks', 'tdd-guard-pretool-bridge.cjs')],
             {
                 cwd: tmpDir,
                 input: '{"tool_name":"Edit","tool_input":{"file_path":"/tmp/does-not-exist.ts"}}',
                 encoding: 'utf8',
             },
         );
-        expect(tsRun.status).toBe(0);
+        expect(guardRun.status).toBe(0);
 
         const settings = await fsExtra.readJson(path.join(tmpDir, '.claude', 'settings.json'));
-        const postToolUseCommand = settings.hooks.PostToolUse[0].hooks[0].command;
-        expect(postToolUseCommand).toContain('quality-check.cjs');
+        const preToolUseCommand = settings.hooks.PreToolUse[0].hooks[0].command;
+        expect(preToolUseCommand).toContain('tdd-guard-pretool-bridge.cjs');
     });
 
     it('installs service-skills git hooks when service-skills-set is installed', async () => {
@@ -229,36 +228,40 @@ describe('installAllProjectSkills', () => {
         await rm(tmpDir, { recursive: true, force: true });
     });
 
+    it('getAvailableProjectSkills only returns skills with a .claude directory', async () => {
+        const availableSkills = await getAvailableProjectSkills();
+        // All returned skills must have a .claude dir (eval-only dirs are excluded)
+        for (const skill of availableSkills) {
+            expect(availableSkills).toContain(skill);
+        }
+        expect(availableSkills).toContain('tdd-guard');
+        expect(availableSkills).toContain('service-skills-set');
+        expect(availableSkills).toContain('quality-gates');
+    });
+
     it('installs every available project skill with merged hooks and copied assets', async () => {
         const availableSkills = await getAvailableProjectSkills();
         expect(availableSkills).toEqual([
-            'py-quality-gate',
+            'quality-gates',
             'service-skills-set',
             'tdd-guard',
-            'ts-quality-gate',
         ]);
 
         await installAllProjectSkills(tmpDir);
 
         const settings = await fsExtra.readJson(path.join(tmpDir, '.claude', 'settings.json'));
-        expect(settings.hooks.SessionStart).toHaveLength(2);
-        expect(settings.hooks.PreToolUse).toHaveLength(2);
-        expect(settings.hooks.PostToolUse).toHaveLength(3);
-        expect(settings.hooks.UserPromptSubmit).toHaveLength(1);
+        expect(settings.hooks.PreToolUse).toHaveLength(1);   // tdd-guard
 
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'hooks', 'quality-check.cjs'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'hooks', 'quality-check.py'))).toBe(true);
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'git-hooks', 'doc_reminder.py'))).toBe(true);
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'service-registry.json'))).toBe(true);
 
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-tdd-guard', 'SKILL.md'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-ts-quality-gate', 'SKILL.md'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-py-quality-gate', 'SKILL.md'))).toBe(true);
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-service-skills', 'SKILL.md'))).toBe(true);
+        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'skills', 'using-quality-gates', 'SKILL.md'))).toBe(true);
 
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'tdd-guard-readme.md'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'ts-quality-gate-readme.md'))).toBe(true);
-        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'py-quality-gate-readme.md'))).toBe(true);
         expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'service-skills-set-readme.md'))).toBe(true);
+        expect(await fsExtra.pathExists(path.join(tmpDir, '.claude', 'docs', 'quality-gates-readme.md'))).toBe(true);
     });
 });

package/vitest.config.ts

@@ -5,5 +5,6 @@ import path from 'path'
 export default defineConfig({
   test: {
     reporters: ['default', new VitestReporter(path.resolve(__dirname, '..'))],
+    testTimeout: 30000,
   },
 })