@xmoon76/dsh-pi-tui 0.1.7 → 0.1.8

package/dist/index.mjs

@@ -29,7 +29,7 @@ import { eastAsianWidth } from "get-east-asian-width";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { EventEmitter } from "events";
-import { isUserInvocable } from "@deepseek-ai/dsh-skill";
+import { isUserInvocable, renderSkillContent } from "@deepseek-ai/dsh-skill";
 //#region src/present.ts
 /** Figma row titles per variant (design literals, not translatable copy). */
 const VARIANT_TITLES = {
@@ -12859,10 +12859,10 @@ var TaskBrowserPanel = class {
 		this.searchInput.invalidate();
 	}
 	handleInput(data) {
-		const isNavUp = data === "\x1B[A" || !this.searchEnabled && data === "k";
-		const isNavDown = data === "\x1B[B" || !this.searchEnabled && data === "j";
-		const isPage = data === "\x1B[5~" || data === "\x1B[6~";
-		if (!isNavUp && !isNavDown && !isPage && data !== "\r" && data !== "\n" && data !== "\x1B" && this.searchEnabled) {
+		const isNavUp = matchesKey(data, "up") || !this.searchEnabled && data === "k";
+		const isNavDown = matchesKey(data, "down") || !this.searchEnabled && data === "j";
+		const isPage = matchesKey(data, "pageUp") || matchesKey(data, "pageDown");
+		if (!isNavUp && !isNavDown && !isPage && !matchesKey(data, "enter") && !matchesKey(data, "escape") && this.searchEnabled) {
 			this.searchInput.handleInput(data);
 			this.applyFilter(this.searchInput.getValue() ?? "");
 			return;
@@ -12881,17 +12881,17 @@ var TaskBrowserPanel = class {
 		}
 		if (isPage) {
 			if (this.filtered.length === 0) return;
-			if (data === "\x1B[5~") this.selected = Math.max(0, this.selected - this.maxVisible);
+			if (matchesKey(data, "pageUp")) this.selected = Math.max(0, this.selected - this.maxVisible);
 			else this.selected = Math.min(this.filtered.length - 1, this.selected + this.maxVisible);
 			this.ensureVisible();
 			return;
 		}
-		if (data === "\r" || data === "\n") {
+		if (matchesKey(data, "enter")) {
 			const item = this.filtered[this.selected];
 			if (item !== void 0) this.onSelect(item.value);
 			return;
 		}
-		if (data === "\x1B") this.onCancel();
+		if (matchesKey(data, "escape")) this.onCancel();
 	}
 	ensureVisible() {
 		if (this.selected < this.scroll) this.scroll = this.selected;
@@ -13493,8 +13493,9 @@ var QuestionFlow = class {
 		if (draft === void 0) return;
 		const text = value.trim();
 		draft.custom = text;
-		if (text === "") draft.skipped = true;
-		else {
+		if (text === "") {
+			if (draft.selected.size === 0) draft.skipped = true;
+		} else {
 			if (this.questions[this.tab]?.multiSelect !== true) draft.selected.clear();
 			draft.skipped = false;
 		}
@@ -13526,44 +13527,34 @@ var QuestionFlow = class {
 	handleInput(data) {
 		if (data === "\0") return;
 		if (this.editingOther) {
-			if (data === "\r" || data === "\n") this.commitOther(this.otherInput.getValue());
-			else if (data === "\x1B") this.exitOther();
-			else if (data === "\x1B[5~" || data === "\x1B[6~") this.scrollBody(data === "\x1B[5~" ? -1 : 1);
-			else if (data === "\x1B[D") {
+			if (matchesKey(data, "enter")) this.commitOther(this.otherInput.getValue());
+			else if (matchesKey(data, "escape")) this.exitOther();
+			else if (matchesKey(data, "pageUp")) this.scrollBody(-1);
+			else if (matchesKey(data, "pageDown")) this.scrollBody(1);
+			else if (matchesKey(data, "left")) {
 				if (this.tab > 0) {
 					this.tab -= 1;
 					this.cursor = 0;
 					this.submitIdx = 0;
 					this.syncEditMode();
 				}
-			} else if (data === "\x1B[C") {
-				if (this.tab < this.questions.length - 1) {
-					this.tab += 1;
-					this.cursor = 0;
-					this.submitIdx = 0;
-					this.syncEditMode();
-				} else {
-					this.tab = this.questions.length;
-					this.submitIdx = 0;
-					this.syncEditMode();
-				}
-			} else this.otherInput.handleInput(data);
+			} else if (matchesKey(data, "right")) this.commitOther(this.otherInput.getValue());
+			else this.otherInput.handleInput(data);
 			return;
 		}
 		const rows = this.rows();
 		if (this.tab >= this.questions.length) {
-			if (data === "\r" || data === "\n") {
+			if (matchesKey(data, "enter")) {
 				if (this.submitIdx === 0) this.submit();
 				else this.onCancel();
-			} else if (data === "\x1B") this.onCancel();
-			else if (data === "\x1B[D" || data === "h") this.submitIdx = 0;
-			else if (data === "\x1B[C" || data === "l") this.submitIdx = 1;
-			else if (data === "b") {
+			} else if (matchesKey(data, "escape")) this.onCancel();
+			else if (matchesKey(data, "left") || data === "h") {
 				this.tab = Math.max(0, this.questions.length - 1);
 				this.cursor = 0;
 				this.submitIdx = 0;
 				this.syncEditMode();
-			}
+			} else if (matchesKey(data, "up") || data === "k") this.submitIdx = 0;
+			else if (matchesKey(data, "down") || data === "j") this.submitIdx = 1;
 			return;
 		}
 		const digit = /^[1-9]$/.exec(data);
@@ -13576,7 +13567,7 @@ var QuestionFlow = class {
 			}
 			return;
 		}
-		if (data === "\x1B[A" || data === "k") {
+		if (matchesKey(data, "up") || data === "k") {
 			if (rows.length === 0) return;
 			if (this.cursor === 0 && this.bodyScroll > 0) {
 				this.scrollBody(-1);
@@ -13586,7 +13577,7 @@ var QuestionFlow = class {
 			this.pendingCursorScroll = true;
 			return;
 		}
-		if (data === "\x1B[B" || data === "j") {
+		if (matchesKey(data, "down") || data === "j") {
 			if (rows.length === 0) return;
 			const atLastRow = this.cursor === rows.length - 1;
 			const scrolled = this.lastExpandable && this.lastContentRows > this.bodyScroll + this.lastVisibleRows;
@@ -13598,19 +13589,19 @@ var QuestionFlow = class {
 			this.pendingCursorScroll = true;
 			return;
 		}
-		if (data === "\x1B[5~" || data === "\x1B[6~") {
-			this.scrollBody(data === "\x1B[5~" ? -1 : 1);
+		if (matchesKey(data, "pageUp") || matchesKey(data, "pageDown")) {
+			this.scrollBody(matchesKey(data, "pageUp") ? -1 : 1);
 			return;
 		}
 		if (data === "e") {
 			this.toggleExpanded();
 			return;
 		}
-		if (data === "\r" || data === "\n") {
+		if (matchesKey(data, "enter")) {
 			this.confirm();
 			return;
 		}
-		if (data === "\x1B[D" || data === "h") {
+		if (matchesKey(data, "left") || data === "h") {
 			if (this.tab > 0) {
 				this.tab -= 1;
 				this.cursor = 0;
@@ -13619,7 +13610,11 @@ var QuestionFlow = class {
 			}
 			return;
 		}
-		if (data === "\x1B[C" || data === "l") {
+		if (matchesKey(data, "right") || data === "l") {
+			if (!this.answered()) {
+				this.skip();
+				return;
+			}
 			if (this.tab < this.questions.length - 1) {
 				this.tab += 1;
 				this.cursor = 0;
@@ -13633,11 +13628,7 @@ var QuestionFlow = class {
 			}
 			return;
 		}
-		if (data === "s") {
-			this.skip();
-			return;
-		}
-		if (data === "\x1B") this.onCancel();
+		if (matchesKey(data, "escape")) this.onCancel();
 	}
 	invalidate() {
 		this.otherInput.invalidate();
@@ -13680,7 +13671,7 @@ var QuestionFlow = class {
 			const submit = this.submitIdx === 0 ? color.textStrong("Submit") : color.textDim("Submit");
 			const cancel = this.submitIdx === 1 ? color.textStrong("Cancel") : color.textDim("Cancel");
 			lines.push(`${this.submitIdx === 0 ? color.primary("→ ") : "  "}${submit}   ${cancel}`);
-			lines.push(color.textDim("← → choose · b back · ↵ confirm · esc cancel"));
+			lines.push(color.textDim("↑↓ choose · ← back · ↵ confirm · esc cancel"));
 			return lines;
 		}
 		const question = this.questions[this.tab];
@@ -13736,14 +13727,14 @@ var QuestionFlow = class {
 		lines.push("");
 		const optionCount = Math.min(rows.length, 9);
 		const scrollable = this.lastExpandable;
+		const arrowVerb = this.editingOther ? "→ next" : "→ skip";
 		const hintParts = [
 			"↑↓ select",
 			optionCount > 0 ? `1-${optionCount} choose` : "",
 			multi ? "↵ toggle" : "↵ confirm",
 			scrollable ? "pgup/pgdn scroll" : "",
 			!this.editingOther ? this.bodyExpanded ? "e collapse" : scrollable ? "e expand" : "" : "",
-			this.questions.length > 1 ? "←→ switch" : "",
-			"s skip",
+			this.questions.length > 1 ? `← back · ${arrowVerb}` : arrowVerb,
 			"esc cancel"
 		].filter((part) => part !== "");
 		const cancel = "esc cancel";
@@ -17699,6 +17690,48 @@ function registerTuiCommands(runner, initial) {
 	const sessionCwd = (agent) => agent.session.header.cwd ?? cwd;
 	const skillTarget = (agent) => resolveLiveSkillTarget(ctx, agent, sessionCwd(agent));
 	/**
+	* Split a skill invocation's trailing input into the skill name and its
+	* arguments: the first whitespace-bounded token is the name (the public
+	* skill-name grammar), everything after it the arguments. Used by the
+	* per-skill wrappers and `/skill`, so `/name args` never looks up a name
+	* containing the whole rest of the line.
+	* @param raw - the invocation's rawInput ('' for a bare command).
+	* @returns the name token ('' when the input is blank) plus the args.
+	*/
+	const splitSkillLine = (raw) => {
+		const trimmed = raw.trimStart();
+		const space = trimmed.search(/\s/);
+		if (space === -1) return [trimmed.trim(), ...[]];
+		return [trimmed.slice(0, space).trim(), trimmed.slice(space).trimStart()];
+	};
+	/**
+	* Structurally validate a skill's optional resource base, so a malformed
+	* provider-supplied value degrades to no hint instead of throwing inside
+	* the fallback rendering (the adapter's conservative rule — hostile
+	* entries are refused, never coerced or thrown on).
+	* @param value - the loaded skill's `resourceBase` (opaque from the adapter).
+	* @returns the validated resource base, or undefined when unreadable.
+	*/
+	const readResourceBase = (value) => {
+		if (typeof value !== "object" || value === null) return void 0;
+		const record = value;
+		switch (record.kind) {
+			case "directory": return typeof record.path === "string" && record.path !== "" ? {
+				kind: "directory",
+				path: record.path
+			} : void 0;
+			case "url": return typeof record.url === "string" && record.url !== "" ? {
+				kind: "url",
+				url: record.url
+			} : void 0;
+			case "opaque": return typeof record.description === "string" && record.description !== "" ? {
+				kind: "opaque",
+				description: record.description
+			} : void 0;
+			default: return;
+		}
+	};
+	/**
 	* The execution boundary for loading one skill into the live session;
 	* shared by /skill and the per-skill slash commands. The skill is fetched
 	* from the CURRENT agent's registry and its invocation policy is RE-CHECKED
@@ -17706,7 +17739,7 @@ function registerTuiCommands(runner, initial) {
 	* authorization. A model-only skill is refused with an explicit error and
 	* never injected.
 	*/
-	const loadSkill = async (agent, name) => {
+	const loadSkill = async (agent, name, args = "") => {
 		const target = skillTarget(agent);
 		if (target === void 0) return {
 			kind: "error",
@@ -17728,19 +17761,37 @@ function registerTuiCommands(runner, initial) {
 			kind: "error",
 			text: `skill "${name}" returned a malformed definition`
 		};
-		const body = typeof skill.content === "string" && skill.content !== "" ? skill.content : skill.description;
-		const message = createUserMessage({
+		const line = args.trim() === "" ? "/" + skill.name : "/" + skill.name + " " + args.trimStart();
+		const userMessage = createUserMessage({
 			content: [{
 				type: "text",
-				text: "Skill loaded by the user: **" + skill.name + "**\n\n" + body
+				text: line
 			}],
-			source: {
-				kind: "plugin",
-				plugin: "tui-skill"
-			}
+			source: { kind: "user" }
 		});
-		if (agent.status === "running") agent.steer(message);
-		else agent.followup(message);
+		const hostSkillLoader = ctx.get("tools")?.get?.("skill", agent);
+		const hostLoadsSkillBody = hostSkillLoader !== void 0 && typeof hostSkillLoader.execute === "function";
+		agent.steer(userMessage);
+		if (!hostLoadsSkillBody) {
+			const body = typeof skill.content === "string" && skill.content !== "" ? skill.content : skill.description;
+			const resourceBase = readResourceBase(skill.resourceBase);
+			agent.inject(createUserMessage({
+				content: [{
+					type: "text",
+					text: renderSkillContent({
+						name: skill.name,
+						provider: typeof skill.provider === "string" && skill.provider !== "" ? skill.provider : "tui",
+						...resourceBase === void 0 ? {} : { resourceBase },
+						content: body
+					})
+				}],
+				source: {
+					kind: "skill-invocation",
+					name: skill.name,
+					form: "instructions"
+				}
+			}));
+		}
 		return {
 			kind: "success",
 			text: "skill " + name + " loaded"
@@ -17776,9 +17827,9 @@ function registerTuiCommands(runner, initial) {
 				const dispose = commands.register({
 					name: skill.name,
 					description: "[skill] " + skill.description,
-					handler: async () => {
+					handler: async (invocation) => {
 						const agent = await requireAgent();
-						return loadSkill(agent, skill.name);
+						return loadSkill(agent, skill.name, invocation?.rawInput ?? "");
 					}
 				});
 				skillDisposers.set(skill.name, dispose);
@@ -17824,9 +17875,9 @@ function registerTuiCommands(runner, initial) {
 				const dispose = commands.register({
 					name,
 					description: `[skill: revalidating] ${name}`,
-					handler: async () => {
+					handler: async (invocation) => {
 						const agent = await requireAgent();
-						return loadSkill(agent, name);
+						return loadSkill(agent, name, invocation?.rawInput ?? "");
 					}
 				});
 				skillDisposers.set(name, dispose);
@@ -17848,8 +17899,8 @@ function registerTuiCommands(runner, initial) {
 				kind: "error",
 				text: "skill service unavailable"
 			};
-			const name = invocation.rawInput.trim();
-			if (name !== "") return loadSkill(liveAgent, name);
+			const [name, ...args] = splitSkillLine(invocation.rawInput);
+			if (name !== "") return loadSkill(liveAgent, name, args.join(" "));
 			const catalog = await readHumanSkillCatalog(target.registry, {
 				cwd: target.cwd,
 				scope: target.scope

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoon76/dsh-pi-tui",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "The dsh-pi-tui bundle: a TUI surface for DeepSeek Harness profiles (dsh --profile pi-tui)",
   "license": "MIT",
   "author": "XMoon <xmoonox@gmail.com>",