pi-ui-extend 0.1.28 → 0.1.31

package/external/pi-tools-suite/src/tool-descriptions.ts

@@ -250,10 +250,10 @@ export const TODO_TOOL_DESCRIPTION: ToolDescription = {
 	name: "todo",
 	label: "Todo",
 	description: "Track and keep in sync non-trivial multi-step work as todos. Actions: create, update, batch_create, batch_update, list, get, delete, clear, export, import. Supports parent/subtask hierarchy, blockers, deferred out-of-scope items, dependencies, and replace:true on create/batch_create/import for intentionally replacing an obsolete plan; skip trivial or chat-only requests. Resynchronize the plan when requirements are added, canceled, or become obsolete, whether from user input or discovered facts. For multi-step plans, include a final user-facing report todo in the initial create/batch_create plan when possible. Keep exactly one task in_progress and complete it only after verification.",
-	promptSnippet: "Track/sync non-trivial multi-step work; include final report item; resync when requirements change; keep one task in_progress",
+	promptSnippet: "Track/sync non-trivial multi-step work; include final report item and close it before sending the report; resync when requirements change; keep one task in_progress",
 	promptGuidelines: [
 		"Use `todo` for complex work with 3+ steps, explicit user task lists, or new non-trivial requirements. Skip single trivial tasks and purely conversational requests.",
-		"For any multi-step implementation/debugging plan, include a final todo item in the initial create/batch_create plan for the user-facing final report. Treat it like any other todo item: as soon as that step is finished, mark it completed immediately. Give it explicit description/acceptance criteria covering changed files/behavior, verification commands/results, remaining manual actions, and never substitute a compression/housekeeping note for the final report.",
+		"For any multi-step implementation/debugging plan, include a final todo item in the initial create/batch_create plan for the user-facing final report. Give it explicit description/acceptance criteria covering changed files/behavior, verification commands/results, remaining manual actions, and never substitute a compression/housekeeping note for the final report. Close that report todo immediately before sending the final report to the user.",
 		"When the user adds, removes, cancels, reprioritizes, or changes the goal, scope, requirements, constraints, or chosen approach, use `todo` before continuing to synchronize the plan: update still-relevant tasks, defer or delete obsolete tasks, add new required tasks, and adjust dependencies/order.",
 		"When your own investigation or verification discovers new facts that make the current todo plan stale, incomplete, impossible, unsafe, or no longer the best approach, use `todo` to revise the plan immediately instead of following outdated tasks.",
 		"Update todos as part of the workflow, not as end-of-task cleanup: whenever you start, finish, block, split, abandon, or materially change a step, call `todo` immediately before continuing.",

package/external/pi-tools-suite/src/usage/lib/google.ts

@@ -52,6 +52,7 @@ type PiAntigravityCredential = {
   type?: string;
   refresh?: string;
   email?: string;
+  activeIndex?: number;
   clientId?: string;
   clientSecret?: string;
   googleClientId?: string;
@@ -62,6 +63,8 @@ type PiAntigravityCredential = {
 
 type GoogleOAuthClientCredentials = { clientId: string; clientSecret?: string };
 
+type PreparedAccount = AntigravityAccount & { originalIndex: number };
+
 // ============================================================================
 // 常量
 // ============================================================================
@@ -149,10 +152,10 @@ async function readAntigravityAccounts(): Promise<AntigravityAccount[]> {
 
     if (!credential) return [];
     const credentialClient = getGoogleOAuthClientCredentials(credential);
-    const accounts = Array.isArray(credential.accounts)
+    const accounts: PreparedAccount[] = Array.isArray(credential.accounts)
       ? credential.accounts
           .filter((account) => getAccountRefreshToken(account))
-          .map((account) => ({ ...credentialClient, ...account }))
+          .map((account, originalIndex) => ({ ...credentialClient, ...account, originalIndex }))
       : [];
     const primaryAccount =
       credential.type === "oauth" && credential.refresh
@@ -161,16 +164,48 @@ async function readAntigravityAccounts(): Promise<AntigravityAccount[]> {
     if (primaryAccount) {
       primaryAccount.email = credential.email;
       Object.assign(primaryAccount, credentialClient);
-      accounts.unshift(primaryAccount);
+      const matchIndex = accounts.findIndex((account) =>
+        (primaryAccount.email && account.email === primaryAccount.email)
+        || (primaryAccount.refreshToken && getAccountRefreshToken(account) === primaryAccount.refreshToken),
+      );
+      if (matchIndex >= 0) {
+        accounts[matchIndex] = { ...accounts[matchIndex], ...primaryAccount };
+      } else {
+        accounts.unshift({ ...primaryAccount, originalIndex: -1 });
+      }
     }
 
     const seen = new Set<string>();
-    return accounts.filter((account) => {
+    const deduped = accounts.filter((account) => {
       const key = account.email || account.refreshToken;
       if (!key || seen.has(key)) return false;
       seen.add(key);
       return true;
     });
+
+    const fallbackActiveIndex = deduped.findIndex((account) =>
+      (credential.email && account.email === credential.email)
+      || (primaryAccount?.refreshToken && getAccountRefreshToken(account) === primaryAccount.refreshToken),
+    );
+    const activeIndex = Number.isInteger(credential.activeIndex)
+      ? credential.activeIndex as number
+      : fallbackActiveIndex;
+    const mostRecentLastUsed = deduped.reduce(
+      (best, account, index) => (account.lastUsed > best.lastUsed ? { index, lastUsed: account.lastUsed } : best),
+      { index: -1, lastUsed: 0 },
+    ).index;
+    const priorityIndex = mostRecentLastUsed >= 0 ? mostRecentLastUsed : activeIndex;
+
+    return deduped
+      .map((account, index) => ({ account, index }))
+      .sort((a, b) => {
+        const aPriority = a.index === priorityIndex ? 1 : 0;
+        const bPriority = b.index === priorityIndex ? 1 : 0;
+        if (aPriority !== bPriority) return bPriority - aPriority;
+        if (a.account.lastUsed !== b.account.lastUsed) return b.account.lastUsed - a.account.lastUsed;
+        return a.account.originalIndex - b.account.originalIndex;
+      })
+      .map(({ account }) => account);
   } catch (error) {
     if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
     throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "0.1.28",
+  "version": "0.1.31",
   "private": false,
   "type": "module",
   "bin": {
@@ -61,12 +61,9 @@
     "prepublishOnly": "npm run check && npm run build:pix && npm run generate-schemas"
   },
   "dependencies": {
-    "@earendil-works/pi-tui": "0.79.1",
-    "@earendil-works/pi-ai": "0.79.1",
-    "@earendil-works/pi-coding-agent": "0.79.1",
-    "@mariozechner/pi-ai": "npm:@earendil-works/pi-ai@0.79.1",
-    "@mariozechner/pi-coding-agent": "npm:@earendil-works/pi-coding-agent@0.79.1",
-    "@mariozechner/pi-tui": "npm:@earendil-works/pi-tui@0.79.1",
+    "@earendil-works/pi-ai": "0.79.3",
+    "@earendil-works/pi-coding-agent": "0.79.3",
+    "@earendil-works/pi-tui": "0.79.3",
     "@mariozechner/clipboard": "^0.3.9",
     "jsonc-parser": "3.3.1",
     "typebox": "1.1.38",