@geoqiao/pi-ask 1.2.2 → 1.3.0

package/docs/remote-events.md

@@ -8,13 +8,13 @@ Use this for local bridges: status cards, desktop helpers, or approval UIs. Do n
 
 Lifecycle:
 
-- `@eko24ive/pi-ask:started`
-- `@eko24ive/pi-ask:completed`
+- `@geoqiao/pi-ask:started`
+- `@geoqiao/pi-ask:completed`
 
 Remote submit:
 
-- `@eko24ive/pi-ask:submit`
-- `@eko24ive/pi-ask:submit-result`
+- `@geoqiao/pi-ask:submit`
+- `@geoqiao/pi-ask:submit-result`
 
 ## Started
 
@@ -25,19 +25,19 @@ type PiAskStartedEvent = {
   version: 1;
   flowId: string;
   toolCallId?: string;
-  source: "tool" | "answer" | "answer:again" | "ask:replay";
+  source: "tool" | "answer" | "answer:again" | "ask:replay" | "ask:resume";
   title?: string;
   questions: AskQuestion[];
   createdAt: number;
 };
 ```
 
-Use `flowId` for submit/correlation. Use `questions[].id` and `questions[].options[].value` for answers.
+Use `flowId` for submit/correlation. Use `questions[].id` and `questions[].options[].value` for answers. `ask:resume` identifies a form recovered from an interrupted tool call. Started-event options preserve the optional `recommended` boolean as presentation metadata only.
 
 ## Submit an answer
 
 ```ts
-pi.events.emit("@eko24ive/pi-ask:submit", {
+pi.events.emit("@geoqiao/pi-ask:submit", {
   version: 1,
   requestId: `bridge-${Date.now()}`,
   flowId,
@@ -73,7 +73,7 @@ Rules:
 ## Cancel
 
 ```ts
-pi.events.emit("@eko24ive/pi-ask:submit", {
+pi.events.emit("@geoqiao/pi-ask:submit", {
   version: 1,
   requestId: `bridge-${Date.now()}`,
   flowId,
@@ -111,7 +111,7 @@ type PiAskCompletedEvent = {
   version: 1;
   flowId: string;
   toolCallId?: string;
-  source: "tool" | "answer" | "answer:again" | "ask:replay";
+  source: "tool" | "answer" | "answer:again" | "ask:replay" | "ask:resume";
   result: AskResult;
   completedAt: number;
 };
@@ -121,11 +121,11 @@ type PiAskCompletedEvent = {
 
 ```ts
 export default function piAskBridge(pi: any) {
-  pi.events.on("@eko24ive/pi-ask:started", (event: any) => {
+  pi.events.on("@geoqiao/pi-ask:started", (event: any) => {
     const question = event.questions[0];
     const option = question.options[0];
 
-    pi.events.emit("@eko24ive/pi-ask:submit", {
+    pi.events.emit("@geoqiao/pi-ask:submit", {
       version: 1,
       requestId: `bridge-${Date.now()}`,
       flowId: event.flowId,
@@ -138,7 +138,7 @@ export default function piAskBridge(pi: any) {
     });
   });
 
-  pi.events.on("@eko24ive/pi-ask:submit-result", (event: any) => {
+  pi.events.on("@geoqiao/pi-ask:submit-result", (event: any) => {
     if (!event.ok) console.error(event.error, event.message);
   });
 }
@@ -153,10 +153,10 @@ Create a temporary bridge and run pi with only this repo extension plus the brid
 ```bash
 cat > /tmp/pi-ask-smoke.ts <<'EOF'
 export default function smoke(pi: any) {
-  pi.events.on("@eko24ive/pi-ask:started", (event: any) => {
+  pi.events.on("@geoqiao/pi-ask:started", (event: any) => {
     const q = event.questions[0];
     setTimeout(() => {
-      pi.events.emit("@eko24ive/pi-ask:submit", {
+      pi.events.emit("@geoqiao/pi-ask:submit", {
         version: 1,
         requestId: `smoke-${Date.now()}`,
         flowId: event.flowId,

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@geoqiao/pi-ask",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Pi package that adds an interactive ask_user clarification tool.",
   "license": "MIT",
   "type": "module",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/geoqiao/pi-ask.git"
+    "url": "git+https://github.com/geoqiao/pi-tools.git",
+    "directory": "packages/pi-ask"
   },
-  "homepage": "https://github.com/geoqiao/pi-ask#readme",
+  "homepage": "https://github.com/geoqiao/pi-tools/tree/main/packages/pi-ask#readme",
   "bugs": {
-    "url": "https://github.com/geoqiao/pi-ask/issues"
+    "url": "https://github.com/geoqiao/pi-tools/issues"
   },
   "keywords": [
     "pi-package",
@@ -31,19 +32,6 @@
     "LICENSE",
     "CHANGELOG.md"
   ],
-  "scripts": {
-    "dev": "sh -c 'ROOT=\"$PWD\"; TARGET=\"${1:-.}\"; if [ \"$TARGET\" = \"--\" ]; then TARGET=\"${2:-.}\"; fi; cd \"$TARGET\" && pi --no-extensions --no-skills --no-prompt-templates --no-themes --no-context-files -e \"$ROOT/src/index.ts\" --skill \"$ROOT/skills/ask-user\"' --",
-    "test": "node --test tests/*.test.ts",
-    "typecheck": "tsc -p tsconfig.json",
-    "format": "biome format --write .",
-    "lint": "biome lint --write .",
-    "check": "ultracite check",
-    "check:ci": "biome ci .",
-    "fix": "ultracite fix",
-    "commit": "cz",
-    "commitlint": "commitlint",
-    "release": "semantic-release"
-  },
   "pi": {
     "extensions": [
       "./src/index.ts"
@@ -56,34 +44,6 @@
     "access": "public",
     "provenance": true
   },
-  "release": {
-    "repositoryUrl": "https://github.com/geoqiao/pi-ask.git",
-    "branches": [
-      "main"
-    ],
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      [
-        "@semantic-release/changelog",
-        {
-          "changelogFile": "CHANGELOG.md"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json",
-            "CHANGELOG.md"
-          ],
-          "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-        }
-      ]
-    ]
-  },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
@@ -92,40 +52,23 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.12",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@earendil-works/pi-ai": "0.79.9",
-    "@earendil-works/pi-coding-agent": "0.79.9",
-    "@earendil-works/pi-tui": "0.79.9",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^12.0.6",
-    "@semantic-release/npm": "^13.1.5",
-    "@semantic-release/release-notes-generator": "^14.1.0",
-    "typebox": "1.1.38",
+    "@earendil-works/pi-ai": "0.84.2",
+    "@earendil-works/pi-coding-agent": "0.84.2",
+    "@earendil-works/pi-tui": "0.84.2",
+    "typebox": "1.3.7",
     "@types/node": "25.6.0",
-    "commitizen": "^4.3.1",
-    "cz-conventional-changelog": "^3.3.0",
-    "lefthook": "^2.1.6",
-    "semantic-release": "^25.0.3",
     "typescript": "6.0.2",
     "ultracite": "7.6.0"
   },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
-  },
-  "pnpm": {
-    "overrides": {
-      "@earendil-works/pi-agent-core": "0.79.9",
-      "@earendil-works/pi-ai": "0.79.9",
-      "@earendil-works/pi-tui": "0.79.9",
-      "@earendil-works/pi-coding-agent": "0.79.9"
-    },
-    "ignoredBuiltDependencies": [
-      "lefthook"
-    ]
+  "scripts": {
+    "dev": "sh -c 'ROOT=\"$PWD\"; TARGET=\"${1:-.}\"; if [ \"$TARGET\" = \"--\" ]; then TARGET=\"${2:-.}\"; fi; cd \"$TARGET\" && pi --no-extensions --no-skills --no-prompt-templates --no-themes --no-context-files -e \"$ROOT/src/index.ts\" --skill \"$ROOT/skills/ask-user\"' --",
+    "test": "node --test tests/*.test.ts",
+    "typecheck": "tsc -p tsconfig.json",
+    "format": "biome format --write .",
+    "lint": "biome lint --write .",
+    "check": "ultracite check",
+    "check:ci": "biome ci .",
+    "fix": "ultracite fix",
+    "pack:check": "pnpm pack --dry-run"
   }
-}
+}

package/skills/ask-user/SKILL.md

@@ -92,6 +92,8 @@ After attempt 2:
 - Avoid defaulting mechanically; infer from whether options are mutually exclusive, can coexist, or need preview-pane detail.
 - Keep option labels short and outcome-oriented.
 - Include trade-off descriptions when non-obvious.
+- Include a stable question `id`, non-empty `prompt`, and a non-empty `value` and visible `label` for every option.
+- Mark grounded preferences with `recommended: true` and explain the reason in `description`; recommendations are presentation-only and never preselected.
 - For research/planning, ask about goals, constraints, evaluation criteria, audience, budget, timeline, risk tolerance, and desired output only when they materially affect the result.
 - Prefer non-`preview` questions when a free-form answer may be useful, since those include an internal `Type your own` option.
 

package/src/answer-commands.ts

@@ -25,6 +25,7 @@ import { runAskFlow } from "./ui/controller.ts";
 
 interface AssistantTextSource {
 	entryId: string;
+	previousUserText?: string;
 	text: string;
 }
 
@@ -192,11 +193,13 @@ function runExtractionUi(
 		loader.onAbort = () => doneOnce({ cancelled: true });
 		extractAskParams({
 			assistantText: assistant.text,
-			auth: selected.auth,
+			previousUserText: assistant.previousUserText,
+			complete: (model, context, options) =>
+				ctx.modelRegistry.complete(model, context, options),
 			model: selected.model,
 			onRetry: (attempt, maxRetries) => {
 				ctx.ui.notify(
-					`Retrying extraction JSON repair (${attempt}/${maxRetries})...`,
+					`Retrying question extraction (${attempt}/${maxRetries})...`,
 					"info"
 				);
 			},
@@ -346,16 +349,40 @@ function findLatestAssistantText(
 				error: `Latest assistant message is incomplete (${message.stopReason}); wait for it to finish, then run /answer again.`,
 			};
 		}
-		const text = message.content
-			.filter(
-				(part): part is { text: string; type: "text" } => part.type === "text"
-			)
-			.map((part) => part.text)
-			.join("\n")
-			.trim();
+		const text = extractTextContent(message.content);
 		if (text) {
-			return { entryId: entry.id, text };
+			return {
+				entryId: entry.id,
+				previousUserText: findPreviousUserText(branch, index),
+				text,
+			};
 		}
 	}
 	return { error: "No assistant message found to extract questions from." };
 }
+
+function findPreviousUserText(
+	branch: ReturnType<ExtensionContext["sessionManager"]["getBranch"]>,
+	beforeIndex: number
+): string | undefined {
+	for (let index = beforeIndex - 1; index >= 0; index--) {
+		const entry = branch[index];
+		if (entry.type !== "message" || entry.message.role !== "user") {
+			continue;
+		}
+		return extractTextContent(entry.message.content) || undefined;
+	}
+	return;
+}
+
+function extractTextContent(
+	content: string | Array<{ text?: string; type: string }>
+): string {
+	if (typeof content === "string") {
+		return content.trim();
+	}
+	return content
+		.flatMap((part) => (part.type === "text" && part.text ? [part.text] : []))
+		.join("\n")
+		.trim();
+}