diff --git a/home/gabriel/features/ai/pi/packages/default.nix b/home/gabriel/features/ai/pi/packages/default.nix
index a2ba0c41..f0c8a6ee 100644
--- a/home/gabriel/features/ai/pi/packages/default.nix
+++ b/home/gabriel/features/ai/pi/packages/default.nix
@@ -2,8 +2,10 @@
   imports = [
     ./hallmark.nix
     ./let-fate-decide.nix
+    ./pi-btw.nix
     ./pi-claude-bridge.nix
     ./pi-codex-image-gen.nix
     ./pi-mcp.nix
+    ./rpiv-ask-user-question.nix
   ];
 }
diff --git a/home/gabriel/features/ai/pi/packages/locks/pi-btw.json b/home/gabriel/features/ai/pi/packages/locks/pi-btw.json
new file mode 100644
index 00000000..a4fff1e1
--- /dev/null
+++ b/home/gabriel/features/ai/pi/packages/locks/pi-btw.json
@@ -0,0 +1,43 @@
+{
+  "name": "@narumitw/pi-btw",
+  "version": "0.49.3",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@narumitw/pi-btw",
+      "version": "0.49.3",
+      "license": "MIT",
+      "dependencies": {
+        "@narumitw/pi-tui-kit": "^0.49.1"
+      },
+      "peerDependencies": {
+        "@earendil-works/pi-ai": "*",
+        "@earendil-works/pi-coding-agent": "*",
+        "@earendil-works/pi-tui": "*"
+      }
+    },
+    "node_modules/@narumitw/pi-tui-kit": {
+      "version": "0.49.3",
+      "resolved": "https://registry.npmjs.org/@narumitw/pi-tui-kit/-/pi-tui-kit-0.49.3.tgz",
+      "integrity": "sha512-ha4MybnoJgAiNpW83Ap7EftfOuO8oNf3mIY3baPO0RFrBPyAUuxSlz7hcs9qh+9daDUMxg3sRPsvzYqFsEQKHg==",
+      "license": "MIT",
+      "dependencies": {
+        "highlight.js": "11.11.1"
+      },
+      "peerDependencies": {
+        "@earendil-works/pi-coding-agent": "*",
+        "@earendil-works/pi-tui": "*"
+      }
+    },
+    "node_modules/highlight.js": {
+      "version": "11.11.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    }
+  }
+}
diff --git a/home/gabriel/features/ai/pi/packages/locks/rpiv-ask-user-question.json b/home/gabriel/features/ai/pi/packages/locks/rpiv-ask-user-question.json
new file mode 100644
index 00000000..67d6e399
--- /dev/null
+++ b/home/gabriel/features/ai/pi/packages/locks/rpiv-ask-user-question.json
@@ -0,0 +1,42 @@
+{
+  "name": "@juicesharp/rpiv-ask-user-question",
+  "version": "2.4.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@juicesharp/rpiv-ask-user-question",
+      "version": "2.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "@juicesharp/rpiv-config": "^2.4.0",
+        "typebox": "^1.1.24"
+      },
+      "peerDependencies": {
+        "@earendil-works/pi-coding-agent": "*",
+        "@earendil-works/pi-tui": "*",
+        "@juicesharp/rpiv-i18n": "*"
+      },
+      "peerDependenciesMeta": {
+        "@juicesharp/rpiv-i18n": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@juicesharp/rpiv-config": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@juicesharp/rpiv-config/-/rpiv-config-2.4.0.tgz",
+      "integrity": "sha512-yUeDLfpAeKv3fdoBsye6bDy8M+TOQDAo8wX7DY9Qqyh60dT65AmWT7HQ/BOc3o08n/5TrwTlX9EnZcPAcgz4pw==",
+      "license": "MIT",
+      "dependencies": {
+        "typebox": "^1.1.24"
+      }
+    },
+    "node_modules/typebox": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/typebox/-/typebox-1.3.10.tgz",
+      "integrity": "sha512-L0MT00X96q0P30f1NrGULgaSbmu8hfTjWbLULeVoM+j5u0jR5wyefoDquX2NmRa39f0KiNIBo1wWSaVvHJTZlA==",
+      "license": "MIT"
+    }
+  }
+}
diff --git a/home/gabriel/features/ai/pi/packages/pi-btw.nix b/home/gabriel/features/ai/pi/packages/pi-btw.nix
new file mode 100644
index 00000000..0520875c
--- /dev/null
+++ b/home/gabriel/features/ai/pi/packages/pi-btw.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: let
+  version = "0.49.3";
+  piBtw = pkgs.buildPiPackage {
+    pname = "pi-btw";
+    inherit version;
+    src = pkgs.fetchzip {
+      url = "https://registry.npmjs.org/@narumitw/pi-btw/-/pi-btw-${version}.tgz";
+      hash = "sha256-qKyLW/oNG8ulrw40QylqrAM18n2w051Esbo6lgWu9UY=";
+    };
+    prePatch = ''
+      ${pkgs.lib.getExe pkgs.jq} 'del(.devDependencies)' package.json > package.json.tmp
+      mv package.json.tmp package.json
+      cp ${./locks/pi-btw.json} package-lock.json
+    '';
+    npmInstallFlags = ["--omit=dev" "--omit=peer" "--legacy-peer-deps"];
+    npmDepsHash = "sha256-eRakRoz/LqnEIechpDUZlkqaiLyjWJ4/uUPpfMXRfk0=";
+  };
+in {
+  programs.pi-coding-agent.settings.packages = [piBtw];
+}
diff --git a/home/gabriel/features/ai/pi/packages/rpiv-ask-user-question.nix b/home/gabriel/features/ai/pi/packages/rpiv-ask-user-question.nix
new file mode 100644
index 00000000..1a8d1b09
--- /dev/null
+++ b/home/gabriel/features/ai/pi/packages/rpiv-ask-user-question.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: let
+  version = "2.4.0";
+  rpivAskUserQuestion = pkgs.buildPiPackage {
+    pname = "rpiv-ask-user-question";
+    inherit version;
+    src = pkgs.fetchzip {
+      url = "https://registry.npmjs.org/@juicesharp/rpiv-ask-user-question/-/rpiv-ask-user-question-${version}.tgz";
+      hash = "sha256-/NCFHdZ85TMzRIZs4QaMEVONzREPyo/XYWyvzbYneF0=";
+    };
+    prePatch = ''
+      ${pkgs.lib.getExe pkgs.jq} 'del(.devDependencies)' package.json > package.json.tmp
+      mv package.json.tmp package.json
+      cp ${./locks/rpiv-ask-user-question.json} package-lock.json
+    '';
+    npmInstallFlags = ["--omit=dev" "--omit=peer" "--legacy-peer-deps"];
+    npmDepsHash = "sha256-71k85XYwT+1LluE9Mm+PyDdupZyoAKSWIzaOCll5K90=";
+  };
+in {
+  programs.pi-coding-agent.settings.packages = [rpivAskUserQuestion];
+}