@cmetech/otto 1.3.2 → 1.3.3

package/packages/pi-coding-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otto/pi-coding-agent",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Coding agent CLI (vendored from pi-mono)",
   "type": "module",
   "otto": {
@@ -28,7 +28,7 @@
     "copy-assets": "node scripts/copy-assets.cjs"
   },
   "dependencies": {
-    "@otto-build/contracts": "^1.3.2",
+    "@otto-build/contracts": "^1.3.3",
     "@mariozechner/jiti": "^2.6.2",
     "@silvia-odwyer/photon-node": "^0.3.4",
     "chalk": "^5.5.0",

package/packages/pi-coding-agent/src/modes/interactive/components/config-selector.test.ts

@@ -0,0 +1,58 @@
+import assert from "node:assert/strict";
+import { join, relative } from "node:path";
+import { describe, it } from "node:test";
+
+import type { ResolvedPaths } from "../../../core/package-manager.js";
+import { ConfigSelectorComponent } from "./config-selector.js";
+
+function makeResolvedPaths(baseDir: string, resourcePath: string): ResolvedPaths {
+	return {
+		extensions: [],
+		skills: [
+			{
+				path: resourcePath,
+				enabled: true,
+				metadata: {
+					source: "auto",
+					scope: "project",
+					origin: "top-level",
+					baseDir,
+				},
+			},
+		],
+		prompts: [],
+		themes: [],
+	};
+}
+
+describe("ResourceList.getResourcePattern", () => {
+	it("honors item.metadata.baseDir when present", () => {
+		const cwd = "/work/project";
+		const agentDir = "/home/user/.pi/agent";
+		// The resource lives under an explicit baseDir distinct from the
+		// top-level base dir (cwd/.pi). The pattern must be relative to baseDir.
+		const baseDir = "/work/project/nested/base";
+		const resourcePath = join(baseDir, "skills", "my-skill", "SKILL.md");
+
+		const component = new ConfigSelectorComponent(
+			makeResolvedPaths(baseDir, resourcePath),
+			{} as any,
+			cwd,
+			agentDir,
+			() => {},
+			() => {},
+			() => {},
+		);
+
+		const resourceList = component.getResourceList() as any;
+		const item = resourceList.groups[0].subgroups[0].items[0];
+
+		const pattern: string = resourceList.getResourcePattern(item);
+
+		// Expected: relative to the explicit baseDir, NOT to cwd/.pi top-level dir.
+		assert.equal(pattern, relative(baseDir, resourcePath));
+		// Sanity: the buggy behaviour (relative to top-level base dir) would
+		// produce a path that climbs out of cwd/.pi with leading "../".
+		assert.ok(!pattern.startsWith(".."), `pattern should not climb out of baseDir, got: ${pattern}`);
+	});
+});

package/packages/pi-coding-agent/src/modes/interactive/components/config-selector.ts

@@ -539,7 +539,7 @@ class ResourceList implements Component, Focusable {
 
 	private getResourcePattern(item: ResourceItem): string {
 		const scope = item.metadata.scope as "user" | "project";
-		const baseDir = this.getTopLevelBaseDir(scope);
+		const baseDir = item.metadata.baseDir ?? this.getTopLevelBaseDir(scope);
 		return relative(baseDir, item.path);
 	}