lsd-pi 1.0.0 → 1.1.0

package/src/resources/extensions/subagent/index.ts

@@ -12,7 +12,7 @@
  * Uses JSON mode to capture structured output from subagents.
  */
 
-import { spawn, type ChildProcess } from "node:child_process";
+import { spawn, execSync, type ChildProcess } from "node:child_process";
 import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
@@ -20,7 +20,13 @@ import * as path from "node:path";
 import type { AgentToolResult } from "@gsd/pi-agent-core";
 import type { Message } from "@gsd/pi-ai";
 import { StringEnum } from "@gsd/pi-ai";
-import { type ExtensionAPI, getMarkdownTheme } from "@gsd/pi-coding-agent";
+import {
+	type ExtensionAPI,
+	getAgentDir,
+	getMarkdownTheme,
+	requestClassifierDecision,
+	requestFileChangeApproval,
+} from "@gsd/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { formatTokenCount } from "../shared/mod.js";
@@ -34,7 +40,10 @@ import {
 	readIsolationMode,
 } from "./isolation.js";
 import { registerWorker, updateWorker } from "./worker-registry.js";
-import { loadEffectiveGSDPreferences } from "../gsd/preferences.js";
+import { handleSubagentPermissionRequest, isSubagentPermissionRequest } from "./approval-proxy.js";
+import { resolveConfiguredSubagentModel } from "./configured-model.js";
+import { resolveSubagentModel } from "./model-resolution.js";
+import { loadEffectivePreferences } from "../shared/preferences.js";
 import { CmuxClient, shellEscape } from "../cmux/index.js";
 
 const MAX_PARALLEL_TASKS = 8;
@@ -259,23 +268,63 @@ function writePromptToTempFile(agentName: string, prompt: string): { dir: string
 	return { dir: tmpDir, filePath };
 }
 
+function readBudgetSubagentModelFromSettings(): string | undefined {
+	try {
+		const settingsPath = path.join(getAgentDir(), "settings.json");
+		if (!fs.existsSync(settingsPath)) return undefined;
+		const raw = fs.readFileSync(settingsPath, "utf-8");
+		const parsed = JSON.parse(raw) as { budgetSubagentModel?: unknown };
+		return typeof parsed.budgetSubagentModel === "string" ? parsed.budgetSubagentModel.trim() || undefined : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
 function buildSubagentProcessArgs(
 	agent: AgentConfig,
 	task: string,
 	tmpPromptPath: string | null,
+	model: string | undefined,
 ): string[] {
 	const args: string[] = ["--mode", "json", "-p", "--no-session"];
-	if (agent.model) args.push("--model", agent.model);
+	if (model) args.push("--model", model);
 	if (agent.tools && agent.tools.length > 0) args.push("--tools", agent.tools.join(","));
 	if (tmpPromptPath) args.push("--append-system-prompt", tmpPromptPath);
 	args.push(`Task: ${task}`);
 	return args;
 }
 
+function resolveSubagentCliPath(defaultCwd: string): string | null {
+	const candidates = [process.env.GSD_BIN_PATH, process.env.LSD_BIN_PATH, process.argv[1]]
+		.map((value) => value?.trim())
+		.filter((value): value is string => Boolean(value && value !== "undefined"));
+
+	for (const candidate of candidates) {
+		if (path.isAbsolute(candidate) && fs.existsSync(candidate)) return candidate;
+	}
+
+	const cwdCandidates = [path.join(defaultCwd, "dist", "loader.js"), path.join(defaultCwd, "scripts", "dev-cli.js")];
+	for (const candidate of cwdCandidates) {
+		if (fs.existsSync(candidate)) return candidate;
+	}
+
+	for (const binName of ["lsd", "gsd"]) {
+		try {
+			const resolved = execSync(`which ${binName}`, { encoding: "utf-8" }).trim();
+			if (resolved) return resolved;
+		} catch {
+			/* ignore */
+		}
+	}
+
+	return null;
+}
+
 function processSubagentEventLine(
 	line: string,
 	currentResult: SingleResult,
 	emitUpdate: () => void,
+	proc?: ChildProcess,
 ): void {
 	if (!line.trim()) return;
 	let event: any;
@@ -285,6 +334,14 @@ function processSubagentEventLine(
 		return;
 	}
 
+	if (proc && isSubagentPermissionRequest(event)) {
+		void handleSubagentPermissionRequest(event, proc, {
+			requestFileChangeApproval,
+			requestClassifierDecision,
+		});
+		return;
+	}
+
 	if (event.type === "message_end" && event.message) {
 		const msg = event.message as Message;
 		currentResult.messages.push(msg);
@@ -300,7 +357,7 @@ function processSubagentEventLine(
 				currentResult.usage.cost += usage.cost?.total || 0;
 				currentResult.usage.contextTokens = usage.totalTokens || 0;
 			}
-			if (!currentResult.model && msg.model) currentResult.model = msg.model;
+			if (msg.model) currentResult.model = msg.model;
 			if (msg.stopReason) currentResult.stopReason = msg.stopReason;
 			if (msg.errorMessage) currentResult.errorMessage = msg.errorMessage;
 		}
@@ -332,6 +389,8 @@ async function runSingleAgent(
 	task: string,
 	cwd: string | undefined,
 	step: number | undefined,
+	modelOverride: string | undefined,
+	parentModel: { provider: string; id: string } | undefined,
 	signal: AbortSignal | undefined,
 	onUpdate: OnUpdateCallback | undefined,
 	makeDetails: (results: SingleResult[]) => SubagentDetails,
@@ -355,6 +414,14 @@ async function runSingleAgent(
 	let tmpPromptDir: string | null = null;
 	let tmpPromptPath: string | null = null;
 
+	const preferences = loadEffectivePreferences()?.preferences;
+	const settingsBudgetModel = readBudgetSubagentModelFromSettings();
+	const resolvedModel = resolveConfiguredSubagentModel(agent, preferences, settingsBudgetModel);
+	const inferredModel = resolveSubagentModel(
+		{ name: agent.name, model: resolvedModel },
+		{ overrideModel: modelOverride, parentModel },
+	);
+
 	const currentResult: SingleResult = {
 		agent: agentName,
 		agentSource: agent.source,
@@ -363,7 +430,7 @@ async function runSingleAgent(
 		messages: [],
 		stderr: "",
 		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
-		model: agent.model,
+		model: inferredModel,
 		step,
 	};
 
@@ -382,16 +449,22 @@ async function runSingleAgent(
 			tmpPromptDir = tmp.dir;
 			tmpPromptPath = tmp.filePath;
 		}
-		const args = buildSubagentProcessArgs(agent, task, tmpPromptPath);
+		const args = buildSubagentProcessArgs(agent, task, tmpPromptPath, inferredModel);
 		let wasAborted = false;
 
 		const exitCode = await new Promise<number>((resolve) => {
 			const bundledPaths = (process.env.GSD_BUNDLED_EXTENSION_PATHS ?? "").split(path.delimiter).map(s => s.trim()).filter(Boolean);
 			const extensionArgs = bundledPaths.flatMap(p => ["--extension", p]);
+			const cliPath = resolveSubagentCliPath(cwd ?? defaultCwd);
+			if (!cliPath) {
+				currentResult.stderr += "Unable to resolve LSD/GSD CLI path for subagent launch.";
+				resolve(1);
+				return;
+			}
 			const proc = spawn(
 				process.execPath,
-				[process.env.GSD_BIN_PATH!, ...extensionArgs, ...args],
-				{ cwd: cwd ?? defaultCwd, shell: false, stdio: ["ignore", "pipe", "pipe"] },
+				[cliPath, ...extensionArgs, ...args],
+				{ cwd: cwd ?? defaultCwd, shell: false, stdio: ["pipe", "pipe", "pipe"] },
 			);
 			liveSubagentProcesses.add(proc);
 			let buffer = "";
@@ -400,7 +473,7 @@ async function runSingleAgent(
 				buffer += data.toString();
 				const lines = buffer.split("\n");
 				buffer = lines.pop() || "";
-				for (const line of lines) processSubagentEventLine(line, currentResult, emitUpdate);
+				for (const line of lines) processSubagentEventLine(line, currentResult, emitUpdate, proc);
 			});
 
 			proc.stderr.on("data", (data) => {
@@ -409,7 +482,7 @@ async function runSingleAgent(
 
 			proc.on("close", (code) => {
 				liveSubagentProcesses.delete(proc);
-				if (buffer.trim()) processSubagentEventLine(buffer, currentResult, emitUpdate);
+				if (buffer.trim()) processSubagentEventLine(buffer, currentResult, emitUpdate, proc);
 				resolve(code ?? 0);
 			});
 
@@ -450,139 +523,28 @@ async function runSingleAgent(
 	}
 }
 
-async function runSingleAgentInCmuxSplit(
-	cmuxClient: CmuxClient,
-	directionOrSurfaceId: "right" | "down" | string,
-	defaultCwd: string,
-	agents: AgentConfig[],
-	agentName: string,
-	task: string,
-	cwd: string | undefined,
-	step: number | undefined,
-	signal: AbortSignal | undefined,
-	onUpdate: OnUpdateCallback | undefined,
-	makeDetails: (results: SingleResult[]) => SubagentDetails,
-): Promise<SingleResult> {
-	const agent = agents.find((a) => a.name === agentName);
-	if (!agent) {
-		return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-	}
-
-	let tmpPromptDir: string | null = null;
-	let tmpPromptPath: string | null = null;
-	let tmpOutputDir: string | null = null;
-
-	const currentResult: SingleResult = {
-		agent: agentName,
-		agentSource: agent.source,
-		task,
-		exitCode: 0,
-		messages: [],
-		stderr: "",
-		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
-		model: agent.model,
-		step,
-	};
-
-	const emitUpdate = () => {
-		if (onUpdate) {
-			onUpdate({
-				content: [{ type: "text", text: getFinalOutput(currentResult.messages) || "(running...)" }],
-				details: makeDetails([currentResult]),
-			});
-		}
-	};
-
-	try {
-		if (agent.systemPrompt.trim()) {
-			const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
-			tmpPromptDir = tmp.dir;
-			tmpPromptPath = tmp.filePath;
-		}
-		tmpOutputDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagent-cmux-"));
-		const stdoutPath = path.join(tmpOutputDir, "stdout.jsonl");
-		const stderrPath = path.join(tmpOutputDir, "stderr.log");
-		const exitPath = path.join(tmpOutputDir, "exit.code");
-		// Accept either a pre-created surface ID or a direction to create a new split
-		const isDirection = directionOrSurfaceId === "right" || directionOrSurfaceId === "down"
-			|| directionOrSurfaceId === "left" || directionOrSurfaceId === "up";
-		const cmuxSurfaceId = isDirection
-			? await cmuxClient.createSplit(directionOrSurfaceId as "right" | "down" | "left" | "up")
-			: directionOrSurfaceId;
-		if (!cmuxSurfaceId) {
-			return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-		}
-
-		const bundledPaths = (process.env.GSD_BUNDLED_EXTENSION_PATHS ?? "").split(path.delimiter).map((s) => s.trim()).filter(Boolean);
-		const extensionArgs = bundledPaths.flatMap((p) => ["--extension", p]);
-		const processArgs = [process.env.GSD_BIN_PATH!, ...extensionArgs, ...buildSubagentProcessArgs(agent, task, tmpPromptPath)];
-		// Normalize all paths to forward slashes before embedding in bash strings.
-		// On Windows, backslashes are interpreted as escape characters by bash,
-		// mangling paths like C:\Users\user into C:Useruser (#1436).
-		const bashPath = (p: string) => shellEscape(p.replaceAll("\\", "/"));
-		const innerScript = [
-			`cd ${bashPath(cwd ?? defaultCwd)}`,
-			"set -o pipefail",
-			`${bashPath(process.execPath)} ${processArgs.map(a => bashPath(a)).join(" ")} 2> >(tee ${bashPath(stderrPath)} >&2) | tee ${bashPath(stdoutPath)}`,
-			"status=${PIPESTATUS[0]}",
-			`printf '%s' "$status" > ${bashPath(exitPath)}`,
-		].join("; ");
-
-		const sent = await cmuxClient.sendSurface(cmuxSurfaceId, `bash -lc ${shellEscape(innerScript)}`);
-		if (!sent) {
-			return runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails);
-		}
-
-		const finished = await waitForFile(exitPath, signal);
-		if (!finished) {
-			currentResult.exitCode = 1;
-			currentResult.stderr = "cmux split execution timed out or was aborted";
-			return currentResult;
-		}
-
-		if (fs.existsSync(stdoutPath)) {
-			const stdout = fs.readFileSync(stdoutPath, "utf-8");
-			for (const line of stdout.split("\n")) {
-				processSubagentEventLine(line, currentResult, emitUpdate);
-			}
-		}
-		if (fs.existsSync(stderrPath)) {
-			currentResult.stderr = fs.readFileSync(stderrPath, "utf-8");
-		}
-		currentResult.exitCode = Number.parseInt(fs.readFileSync(exitPath, "utf-8").trim() || "1", 10) || 0;
-		return currentResult;
-	} finally {
-		if (tmpPromptPath)
-			try {
-				fs.unlinkSync(tmpPromptPath);
-			} catch {
-				/* ignore */
-			}
-		if (tmpPromptDir)
-			try {
-				fs.rmdirSync(tmpPromptDir);
-			} catch {
-				/* ignore */
-			}
-		if (tmpOutputDir)
-			try {
-				fs.rmSync(tmpOutputDir, { recursive: true, force: true });
-			} catch {
-				/* ignore */
-			}
-	}
-}
-
 const TaskItem = Type.Object({
 	agent: Type.String({ description: "Name of the agent to invoke" }),
 	task: Type.String({ description: "Task to delegate to the agent" }),
 	cwd: Type.Optional(Type.String({ description: "Working directory for the agent process" })),
+	model: Type.Optional(
+		Type.String({
+			description:
+				"Optional model override. If omitted, the launcher infers one from the agent config, delegated-task preferences, or the current session model.",
+		}),
+	),
 });
 
 const ChainItem = Type.Object({
 	agent: Type.String({ description: "Name of the agent to invoke" }),
 	task: Type.String({ description: "Task with optional {previous} placeholder for prior output" }),
 	cwd: Type.Optional(Type.String({ description: "Working directory for the agent process" })),
+	model: Type.Optional(
+		Type.String({
+			description:
+				"Optional model override. If omitted, the launcher infers one from the agent config, delegated-task preferences, or the current session model.",
+		}),
+	),
 });
 
 const AgentScopeSchema = StringEnum(["user", "project", "both"] as const, {
@@ -600,6 +562,12 @@ const SubagentParams = Type.Object({
 		Type.Boolean({ description: "Prompt before running project-local agents. Default: false.", default: false }),
 	),
 	cwd: Type.Optional(Type.String({ description: "Working directory for the agent process (single mode)" })),
+	model: Type.Optional(
+		Type.String({
+			description:
+				"Optional model override for single mode. If omitted, the launcher infers one from the agent config, delegated-task preferences, or the current session model.",
+		}),
+	),
 	isolated: Type.Optional(
 		Type.Boolean({
 			description:
@@ -622,7 +590,7 @@ export default function (pi: ExtensionAPI) {
 		handler: async (_args, ctx) => {
 			const discovery = discoverAgents(ctx.cwd, "both");
 			if (discovery.agents.length === 0) {
-				ctx.ui.notify("No agents found. Add .md files to ~/.gsd/agent/agents/ or .gsd/agents/", "warning");
+				ctx.ui.notify("No agents found. Add .md files to ~/.lsd/agent/agents/ (or your configured agent dir) or .lsd/agents/", "warning");
 				return;
 			}
 			const lines = discovery.agents.map(
@@ -638,8 +606,9 @@ export default function (pi: ExtensionAPI) {
 		description: [
 			"Delegate tasks to specialized subagents with isolated context windows.",
 			"Each subagent is a separate pi process with its own tools, model, and system prompt.",
+			"Model selection can be overridden per call, otherwise it is inferred from the agent config, delegated-task preferences, or the current session model.",
 			"Modes: single ({ agent, task }), parallel ({ tasks: [{agent, task},...] }), chain ({ chain: [{agent, task},...] } with {previous} placeholder).",
-			"Agents are defined as .md files in ~/.gsd/agent/agents/ (user) or .gsd/agents/ (project).",
+			"Agents are defined as .md files in the configured user agent directory (for LSD this is typically ~/.lsd/agent/agents/) or project-local .lsd/agents/, with legacy support for .gsd/agents/ and .pi/agents/.",
 			"Use the /subagent command to list available agents and their descriptions.",
 			"Use chain mode to pipeline: scout finds context, planner designs, worker implements.",
 		].join(" "),
@@ -657,7 +626,7 @@ export default function (pi: ExtensionAPI) {
 			const discovery = discoverAgents(ctx.cwd, agentScope);
 			const agents = discovery.agents;
 			const confirmProjectAgents = params.confirmProjectAgents ?? false;
-			const cmuxClient = CmuxClient.fromPreferences(loadEffectiveGSDPreferences()?.preferences);
+			const cmuxClient = CmuxClient.fromPreferences(loadEffectivePreferences()?.preferences);
 			const cmuxSplitsEnabled = cmuxClient.getConfig().splits;
 
 			// Resolve isolation mode
@@ -746,6 +715,8 @@ export default function (pi: ExtensionAPI) {
 						taskWithContext,
 						step.cwd,
 						i + 1,
+						step.model,
+						ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined,
 						signal,
 						chainUpdate,
 						makeDetails("chain"),
@@ -816,37 +787,19 @@ export default function (pi: ExtensionAPI) {
 				const batchId = crypto.randomUUID();
 				const batchSize = params.tasks.length;
 				// Pre-create a grid layout for cmux splits so agents get a clean tiled arrangement
-				const gridSurfaces = cmuxSplitsEnabled
-					? await cmuxClient.createGridLayout(Math.min(batchSize, MAX_CONCURRENCY))
-					: [];
+				const gridSurfaces: string[] = [];
 				const results = await mapWithConcurrencyLimit(params.tasks, MAX_CONCURRENCY, async (t, index) => {
 					const workerId = registerWorker(t.agent, t.task, index, batchSize, batchId);
-					const runTask = () => cmuxSplitsEnabled
-						? runSingleAgentInCmuxSplit(
-							cmuxClient,
-							gridSurfaces[index] ?? (index % 2 === 0 ? "right" : "down"),
-							ctx.cwd,
-							agents,
-							t.agent,
-							t.task,
-							t.cwd,
-							undefined,
-							signal,
-							(partial) => {
-								if (partial.details?.results[0]) {
-									allResults[index] = partial.details.results[0];
-									emitParallelUpdate();
-								}
-							},
-							makeDetails("parallel"),
-						)
-						: runSingleAgent(
+					const runTask = () =>
+						runSingleAgent(
 							ctx.cwd,
 							agents,
 							t.agent,
 							t.task,
 							t.cwd,
 							undefined,
+							t.model,
+							ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined,
 							signal,
 							(partial) => {
 								if (partial.details?.results[0]) {
@@ -900,31 +853,19 @@ export default function (pi: ExtensionAPI) {
 						isolation = await createIsolation(effectiveCwd, taskId, isolationMode);
 					}
 
-					const result = cmuxSplitsEnabled
-						? await runSingleAgentInCmuxSplit(
-							cmuxClient,
-							"right",
-							ctx.cwd,
-							agents,
-							params.agent,
-							params.task,
-							isolation ? isolation.workDir : params.cwd,
-							undefined,
-							signal,
-							onUpdate,
-							makeDetails("single"),
-						)
-						: await runSingleAgent(
-							ctx.cwd,
-							agents,
-							params.agent,
-							params.task,
-							isolation ? isolation.workDir : params.cwd,
-							undefined,
-							signal,
-							onUpdate,
-							makeDetails("single"),
-						);
+					const result = await runSingleAgent(
+						ctx.cwd,
+						agents,
+						params.agent,
+						params.task,
+						isolation ? isolation.workDir : params.cwd,
+						undefined,
+						params.model,
+						ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined,
+						signal,
+						onUpdate,
+						makeDetails("single"),
+					);
 
 					// Capture and merge delta if isolated
 					if (isolation) {

package/src/resources/extensions/subagent/model-resolution.ts

@@ -0,0 +1,26 @@
+export interface ResolvedSubagentAgent {
+	name: string;
+	model?: string;
+}
+
+export interface ResolveSubagentModelOptions {
+	overrideModel?: string;
+	parentModel?: { provider: string; id: string };
+}
+
+export function resolveSubagentModel(
+	agent: ResolvedSubagentAgent,
+	options: ResolveSubagentModelOptions = {},
+): string | undefined {
+	const overrideModel = options.overrideModel?.trim();
+	if (overrideModel) return overrideModel;
+
+	const agentModel = agent.model?.trim();
+	if (agentModel) return agentModel;
+
+	if (options.parentModel?.provider && options.parentModel?.id) {
+		return `${options.parentModel.provider}/${options.parentModel.id}`;
+	}
+
+	return undefined;
+}

package/src/resources/extensions/ttsr/ttsr-manager.ts

@@ -10,7 +10,7 @@
  * per-rule JS RegExp iteration when the native module is not loaded.
  */
 import picomatch from "picomatch";
-import { debugTime, debugCount, debugPeak } from "../gsd/debug-logger.js";
+import { debugTime, debugCount, debugPeak } from "../shared/debug-logger.js";
 
 // ── Native TTSR engine (optional) ─────────────────────────────────────
 let nativeTtsr: {

package/src/resources/skills/create-skill/SKILL.md

@@ -86,8 +86,8 @@ Then proceed directly to the workflow.
 ## Skill Structure Quick Reference
 
 **Skill directories:**
-- Global: `~/.gsd/agent/skills/{skill-name}/`
-- Project-local: `.pi/agent/skills/{skill-name}/`
+- Global: `~/.lsd/skills/{skill-name}/`
+- Project-local: `.lsd/skills/{skill-name}/`
 
 **Simple skill (single file):**
 ```yaml

package/src/resources/skills/create-skill/references/gsd-skill-ecosystem.md

@@ -5,14 +5,13 @@ GSD-specific skill ecosystem details: directory conventions, discovery mechanics
 <skill_directories>
 GSD supports two skill directories, checked in order:
 
-**User-scope (global):** `~/.gsd/agent/skills/`
-- Available in every GSD session regardless of working directory
-- Installed by default or by the user
+**User-scope (global):** `~/.lsd/skills/`
+- Available in every GSD/LSD session regardless of working directory
+- Preferred global location for LSD-managed skills
 
-**Project-scope (local):** `.pi/agent/skills/`
-- Available only when GSD runs inside the project directory
-- The project-local directory uses `.pi` (inherited from the pi base), **not** `.gsd`
-- Ideal for project-specific workflows, deploy scripts, or conventions
+**Project-scope (local):** `.lsd/skills/`
+- Available only when LSD runs inside the project directory
+- Recommended for repo-specific workflows, deploy scripts, or conventions
 
 Skills in both directories follow the same SKILL.md format and router pattern conventions.
 </skill_directories>
@@ -66,3 +65,5 @@ After creating or modifying a skill:
 2. On next session start, auto-discovery picks it up automatically
 3. In auto-mode, new skills are detected at unit boundaries without any action needed
 </activation>
+ are detected at unit boundaries without any action needed
+</activation>

package/src/resources/skills/create-skill/workflows/audit-skill.md

@@ -16,22 +16,22 @@
 Enumerate skills from both directories:
 ```bash
 echo "=== Global skills ==="
-ls ~/.gsd/agent/skills/ 2>/dev/null || echo "(none)"
+ls ~/.lsd/skills/ 2>/dev/null || echo "(none)"
 
 echo "=== Project-local skills ==="
-ls .pi/agent/skills/ 2>/dev/null || echo "(none)"
+ls .lsd/skills/ 2>/dev/null || echo "(none)"
 ```
 
 Present as:
 ```
 Available skills:
 
-Global (~/.gsd/agent/skills/):
+Global (~/.lsd/skills/):
 1. create-skill
 2. manage-stripe
 ...
 
-Project-local (.pi/agent/skills/):
+Project-local (.lsd/skills/):
 3. project-deploy
 ...
 ```

package/src/resources/skills/create-skill/workflows/create-new-skill.md

@@ -15,8 +15,8 @@
 **Ask the user:**
 "Should this skill be global or project-local?"
 
-1. **Global** (`~/.gsd/agent/skills/`) — Available in all GSD sessions
-2. **Project-local** (`.pi/agent/skills/`) — Available only in this project
+1. **Global** (`~/.lsd/skills/`) — Available in all GSD/LSD sessions
+2. **Project-local** (`.lsd/skills/`) — Available only in this project
 
 ## Step 2: Adaptive Requirements Gathering
 
@@ -99,11 +99,11 @@ See references/recommended-structure.md for templates.
 ## Step 5: Create Directory
 
 Use the scope selected in Step 1 to determine the base path:
-- **Global:** `~/.gsd/agent/skills/{skill-name}`
-- **Project-local:** `.pi/agent/skills/{skill-name}`
+- **Global:** `~/.lsd/skills/{skill-name}`
+- **Project-local:** `.lsd/skills/{skill-name}`
 
 ```bash
-BASE_PATH="{selected-base}/agent/skills/{skill-name}"
+BASE_PATH="{selected-base}/skills/{skill-name}"
 mkdir -p $BASE_PATH
 # If complex:
 mkdir -p $BASE_PATH/workflows
@@ -194,3 +194,4 @@ Skill is complete when:
 - [ ] /reload run to activate
 - [ ] Tested with real invocation
 </success_criteria>
+criteria>