thepopebot 1.2.72-beta.13 → 1.2.72-beta.15

package/README.md

@@ -289,7 +289,7 @@ See [docs/RUNNING_DIFFERENT_MODELS.md](docs/RUNNING_DIFFERENT_MODELS.md) for the
 | [Auto-Merge](docs/AUTO_MERGE.md) | Auto-merge controls, ALLOWED_PATHS configuration |
 | [Deployment](docs/DEPLOYMENT.md) | VPS setup, Docker Compose, HTTPS with Let's Encrypt |
 | [Claude Code vs Pi](docs/CLAUDE_CODE_VS_PI.md) | Comparing the two agent backends (subscription vs API credits) |
-| [How to Use Pi](docs/HOW_TO_USE_PI.md) | Guide to the Pi coding agent |
+| [How to Build Skills](docs/HOW_TO_BUILD_SKILLS.md) | Guide to building and activating agent skills |
 | [Pre-Release](docs/PRE_RELEASE.md) | Installing beta/alpha builds |
 | [Security](docs/SECURITY.md) | Security disclaimer, local development risks |
 | [Upgrading](docs/UPGRADE.md) | Automated upgrades, recovering from failed upgrades |
@@ -298,4 +298,4 @@ See [docs/RUNNING_DIFFERENT_MODELS.md](docs/RUNNING_DIFFERENT_MODELS.md) for the
 
 | Document | Description |
 |----------|-------------|
-| [NPM](docs/NPM.md) | Updating pi-skills, versioning, and publishing releases |
+| [NPM](docs/NPM.md) | Updating skills, versioning, and publishing releases |

package/bin/cli.js

@@ -207,17 +207,34 @@ async function init() {
     }
   }
 
-  // Create default skill symlinks (brave-search, browser-tools)
-  const defaultSkills = ['browser-tools'];
+  // Create default skill activation symlinks
+  const defaultSkills = ['browser-tools', 'llm-secrets', 'modify-self'];
+  const activeDir = path.join(cwd, 'skills', 'active');
+  fs.mkdirSync(activeDir, { recursive: true });
   for (const skill of defaultSkills) {
-    const symlink = path.join(cwd, '.pi', 'skills', skill);
+    const symlink = path.join(activeDir, skill);
     if (!fs.existsSync(symlink)) {
-      fs.mkdirSync(path.dirname(symlink), { recursive: true });
-      createDirLink(`../../pi-skills/${skill}`, symlink);
-      console.log(`  Created .pi/skills/${skill} → ../../pi-skills/${skill}`);
+      createDirLink(`../${skill}`, symlink);
+      console.log(`  Created skills/active/${skill} → ../${skill}`);
     }
   }
 
+  // Create .pi/skills → ../skills/active symlink
+  const piSkillsLink = path.join(cwd, '.pi', 'skills');
+  if (!fs.existsSync(piSkillsLink)) {
+    fs.mkdirSync(path.dirname(piSkillsLink), { recursive: true });
+    createDirLink('../skills/active', piSkillsLink);
+    console.log('  Created .pi/skills → ../skills/active');
+  }
+
+  // Create .claude/skills → ../skills/active symlink
+  const claudeSkillsLink = path.join(cwd, '.claude', 'skills');
+  if (!fs.existsSync(claudeSkillsLink)) {
+    fs.mkdirSync(path.dirname(claudeSkillsLink), { recursive: true });
+    createDirLink('../skills/active', claudeSkillsLink);
+    console.log('  Created .claude/skills → ../skills/active');
+  }
+
   // Report updated managed files
   if (updated.length > 0) {
     console.log('\n  Updated managed files:');

package/lib/ai/agent.js

@@ -1,7 +1,7 @@
 import { createReactAgent } from '@langchain/langgraph/prebuilt';
 import { SystemMessage } from '@langchain/core/messages';
 import { createModel } from './model.js';
-import { createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getPiSkillCreationGuideTool } from './tools.js';
+import { createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getSkillBuildingGuideTool } from './tools.js';
 import { SqliteSaver } from '@langchain/langgraph-checkpoint-sqlite';
 import { eventHandlerMd, thepopebotDb } from '../paths.js';
 import { render_md } from '../utils/render-md.js';
@@ -16,7 +16,7 @@ let _agent = null;
 export async function getAgent() {
   if (!_agent) {
     const model = await createModel();
-    const tools = [createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getPiSkillCreationGuideTool];
+    const tools = [createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getSkillBuildingGuideTool];
     const checkpointer = SqliteSaver.fromConnString(thepopebotDb);
 
     _agent = createReactAgent({

package/lib/ai/index.js

@@ -1,4 +1,5 @@
 import { HumanMessage, AIMessage } from '@langchain/core/messages';
+import { z } from 'zod';
 import { getAgent } from './agent.js';
 import { createModel } from './model.js';
 import { jobSummaryMd } from '../paths.js';
@@ -207,6 +208,7 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
 
 /**
  * Auto-generate a chat title from the first user message (fire-and-forget).
+ * Uses structured output to avoid thinking-token leaks with extended-thinking models.
  */
 async function autoTitle(threadId, firstMessage) {
   try {
@@ -214,16 +216,12 @@ async function autoTitle(threadId, firstMessage) {
     if (!chat || chat.title !== 'New Chat') return;
 
     const model = await createModel({ maxTokens: 250 });
-    const response = await model.invoke([
-      ['system', 'Generate a short (3-6 word) title for this chat based on the user\'s first message. Return ONLY the title, nothing else.'],
+    const response = await model.withStructuredOutput(z.object({ title: z.string() })).invoke([
+      ['system', 'Generate a descriptive (8-12 word) title for this chat based on the user\'s first message.'],
       ['human', firstMessage],
     ]);
-    const title = typeof response.content === 'string'
-      ? response.content
-      : response.content.filter(b => b.type === 'text').map(b => b.text).join('');
-    const cleaned = title.replace(/^["']+|["']+$/g, '').trim();
-    if (cleaned) {
-      updateChatTitle(threadId, cleaned);
+    if (response.title.trim()) {
+      updateChatTitle(threadId, response.title.trim());
     }
   } catch (err) {
     console.error('[autoTitle] Failed to generate title:', err.message);

package/lib/ai/tools.js

@@ -60,12 +60,12 @@ const getSystemTechnicalSpecsTool = tool(
   {
     name: 'get_system_technical_specs',
     description:
-      'Read the system architecture and technical documentation (CLAUDE.md). You MUST call this before modifying any config file (CRONS.json, TRIGGERS.json, etc.) or system infrastructure — config entries have advanced fields (per-entry LLM overrides, webhook options, etc.) that are only documented here. Also use this when you need to understand how the system works — event handler, Docker agent, API routes, database, GitHub Actions, deployment, or file structure. NOT for Pi skill creation (use get_pi_skill_creation_guide for that).',
+      'Read the system architecture and technical documentation (CLAUDE.md). You MUST call this before modifying any config file (CRONS.json, TRIGGERS.json, etc.) or system infrastructure — config entries have advanced fields (per-entry LLM overrides, webhook options, etc.) that are only documented here. Also use this when you need to understand how the system works — event handler, Docker agent, API routes, database, GitHub Actions, deployment, or file structure. NOT for skill creation (use get_skill_building_guide for that).',
     schema: z.object({}),
   }
 );
 
-const getPiSkillCreationGuideTool = tool(
+const getSkillBuildingGuideTool = tool(
   async () => {
     try {
       return fs.readFileSync(skillGuidePath, 'utf8');
@@ -74,11 +74,11 @@ const getPiSkillCreationGuideTool = tool(
     }
   },
   {
-    name: 'get_pi_skill_creation_guide',
+    name: 'get_skill_building_guide',
     description:
-      'Load the guide for creating, modifying, and understanding Pi agent skills (pi-skills). You MUST call this before creating or modifying any skill — the guide contains required file structure, naming conventions, SKILL.md frontmatter format, {baseDir} patterns, activation steps, and testing procedures that are only documented there. This is about Pi skills specifically — the lightweight bash/Node.js wrappers that extend what the Docker agent can do. NOT for understanding the system architecture (use get_system_technical_specs for that).',
+      'Load the guide for creating, modifying, and understanding agent skills. You MUST call this before creating or modifying any skill — the guide contains required file structure, naming conventions, SKILL.md frontmatter format, activation steps, and testing procedures that are only documented there. Skills are lightweight bash/Node.js wrappers in `skills/` that extend what agents can do. NOT for understanding the system architecture (use get_system_technical_specs for that).',
     schema: z.object({}),
   }
 );
 
-export { createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getPiSkillCreationGuideTool };
+export { createJobTool, getJobStatusTool, getSystemTechnicalSpecsTool, getSkillBuildingGuideTool };

package/lib/chat/actions.js

@@ -85,6 +85,20 @@ export async function deleteChat(chatId) {
   return { success: true };
 }
 
+/**
+ * Get the title of a specific chat (with ownership check).
+ * @param {string} chatId
+ * @returns {Promise<string|null>}
+ */
+export async function getChatTitle(chatId) {
+  const user = await requireAuth();
+  const chat = getChatById(chatId);
+  if (!chat || (chat.userId !== user.id && chat.userId !== 'telegram')) {
+    return null;
+  }
+  return chat.title;
+}
+
 /**
  * Rename a chat (with ownership check).
  * @param {string} chatId

package/lib/chat/components/chat-header.js

@@ -1,8 +1,26 @@
 "use client";
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useState, useEffect, useCallback } from "react";
 import { SidebarTrigger } from "./ui/sidebar.js";
+import { getChatTitle } from "../actions.js";
 function ChatHeader({ chatId }) {
-  return /* @__PURE__ */ jsx("header", { className: "sticky top-0 flex items-center gap-2 bg-background px-2 py-1.5 md:px-2 z-10", children: /* @__PURE__ */ jsx("div", { className: "md:hidden", children: /* @__PURE__ */ jsx(SidebarTrigger, {}) }) });
+  const [title, setTitle] = useState(null);
+  const fetchTitle = useCallback(() => {
+    getChatTitle(chatId).then((t) => {
+      if (t && t !== "New Chat") setTitle(t);
+    }).catch(() => {
+    });
+  }, [chatId]);
+  useEffect(() => {
+    fetchTitle();
+    const handler = () => fetchTitle();
+    window.addEventListener("chatsupdated", handler);
+    return () => window.removeEventListener("chatsupdated", handler);
+  }, [fetchTitle]);
+  return /* @__PURE__ */ jsxs("header", { className: "sticky top-0 flex items-center gap-2 border-b border-border bg-background px-4 py-3 z-10", children: [
+    /* @__PURE__ */ jsx("div", { className: "md:hidden", children: /* @__PURE__ */ jsx(SidebarTrigger, {}) }),
+    title && /* @__PURE__ */ jsx("h1", { className: "text-base font-medium text-muted-foreground", children: title })
+  ] });
 }
 export {
   ChatHeader

package/lib/chat/components/chat-header.jsx

@@ -1,14 +1,39 @@
 'use client';
 
+import { useState, useEffect, useCallback } from 'react';
 import { SidebarTrigger } from './ui/sidebar.js';
+import { getChatTitle } from '../actions.js';
 
 export function ChatHeader({ chatId }) {
+  const [title, setTitle] = useState(null);
+
+  const fetchTitle = useCallback(() => {
+    getChatTitle(chatId)
+      .then((t) => {
+        if (t && t !== 'New Chat') setTitle(t);
+      })
+      .catch(() => {});
+  }, [chatId]);
+
+  // Fetch on mount and whenever chats are updated (title generated by LLM)
+  useEffect(() => {
+    fetchTitle();
+    const handler = () => fetchTitle();
+    window.addEventListener('chatsupdated', handler);
+    return () => window.removeEventListener('chatsupdated', handler);
+  }, [fetchTitle]);
+
   return (
-    <header className="sticky top-0 flex items-center gap-2 bg-background px-2 py-1.5 md:px-2 z-10">
+    <header className="sticky top-0 flex items-center gap-2 border-b border-border bg-background px-4 py-3 z-10">
       {/* Mobile-only: open sidebar sheet */}
       <div className="md:hidden">
         <SidebarTrigger />
       </div>
+      {title && (
+        <h1 className="text-base font-medium text-muted-foreground">
+          {title}
+        </h1>
+      )}
     </header>
   );
 }

package/lib/chat/components/message.js

@@ -74,7 +74,8 @@ const linkSafety = {
 const TOOL_DISPLAY_NAMES = {
   create_job: "Create Job",
   get_job_status: "Check Job Status",
-  get_system_technical_specs: "Read System Docs"
+  get_system_technical_specs: "Read Tech Docs",
+  get_skill_building_guide: "Read Skill Docs"
 };
 function getToolDisplayName(toolName) {
   return TOOL_DISPLAY_NAMES[toolName] || toolName.replace(/_/g, " ");

package/lib/chat/components/message.jsx

@@ -67,7 +67,8 @@ export const linkSafety = {
 const TOOL_DISPLAY_NAMES = {
   create_job: 'Create Job',
   get_job_status: 'Check Job Status',
-  get_system_technical_specs: 'Read System Docs',
+  get_system_technical_specs: 'Read Tech Docs',
+  get_skill_building_guide: 'Read Skill Docs',
 };
 
 function getToolDisplayName(toolName) {

package/lib/chat/components/tool-call.js

@@ -6,7 +6,8 @@ import { cn } from "../utils.js";
 const TOOL_DISPLAY_NAMES = {
   create_job: "Create Job",
   get_job_status: "Check Job Status",
-  get_system_technical_specs: "Read System Docs"
+  get_system_technical_specs: "Read Tech Docs",
+  get_skill_building_guide: "Read Skill Docs"
 };
 function getToolDisplayName(toolName) {
   return TOOL_DISPLAY_NAMES[toolName] || toolName.replace(/_/g, " ");

package/lib/chat/components/tool-call.jsx

@@ -7,7 +7,8 @@ import { cn } from '../utils.js';
 const TOOL_DISPLAY_NAMES = {
   create_job: 'Create Job',
   get_job_status: 'Check Job Status',
-  get_system_technical_specs: 'Read System Docs',
+  get_system_technical_specs: 'Read Tech Docs',
+  get_skill_building_guide: 'Read Skill Docs',
 };
 
 function getToolDisplayName(toolName) {

package/lib/paths.js

@@ -19,9 +19,9 @@ export const eventHandlerMd = path.join(PROJECT_ROOT, 'config', 'EVENT_HANDLER.m
 export const jobSummaryMd = path.join(PROJECT_ROOT, 'config', 'JOB_SUMMARY.md');
 export const soulMd = path.join(PROJECT_ROOT, 'config', 'SOUL.md');
 export const claudeMd = path.join(PROJECT_ROOT, 'CLAUDE.md');
-export const skillGuidePath = path.join(PROJECT_ROOT, 'config', 'PI_SKILL_GUIDE.md');
+export const skillGuidePath = path.join(PROJECT_ROOT, 'config', 'SKILL_BUILDING_GUIDE.md');
 
-// Pi skills
+// Active skills (resolves through .pi/skills → skills/active symlink)
 export const piSkillsDir = path.join(PROJECT_ROOT, '.pi', 'skills');
 
 // Working directories for command-type actions

package/lib/tools/create-job.js

@@ -1,23 +1,22 @@
 import { v4 as uuidv4 } from 'uuid';
+import { z } from 'zod';
 import { githubApi } from './github.js';
 import { createModel } from '../ai/model.js';
 
 /**
  * Generate a short descriptive title for a job using the LLM.
+ * Uses structured output to avoid thinking-token leaks with extended-thinking models.
  * @param {string} jobDescription - The full job description
  * @returns {Promise<string>} ~10 word title
  */
 async function generateJobTitle(jobDescription) {
   try {
     const model = await createModel({ maxTokens: 100 });
-    const response = await model.invoke([
-      ['system', 'Generate a descriptive ~10 word title for this agent job. The title should clearly describe what the job will do. Return ONLY the title, nothing else. No quotes.'],
+    const response = await model.withStructuredOutput(z.object({ title: z.string() })).invoke([
+      ['system', 'Generate a descriptive ~10 word title for this agent job. The title should clearly describe what the job will do.'],
       ['human', jobDescription],
     ]);
-    const text = typeof response.content === 'string'
-      ? response.content
-      : response.content.filter(b => b.type === 'text').map(b => b.text).join('');
-    return text.replace(/^["']+|["']+$/g, '').trim() || jobDescription.slice(0, 80);
+    return response.title.trim() || jobDescription.slice(0, 80);
   } catch {
     // Fallback: first line, truncated
     const firstLine = jobDescription.split('\n').find(l => l.trim()) || jobDescription;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.72-beta.13",
+  "version": "1.2.72-beta.15",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

package/setup/lib/prompts.mjs

@@ -70,13 +70,19 @@ export async function promptForProvider() {
 
 /**
  * Prompt for model selection from a provider's model list
+ * @param {string} providerKey - Provider key from PROVIDERS registry
+ * @param {object} [options] - Options
+ * @param {string} [options.defaultModelId] - Override which model gets "(recommended)" instead of the registry default
  */
-export async function promptForModel(providerKey) {
+export async function promptForModel(providerKey, { defaultModelId } = {}) {
   const provider = PROVIDERS[providerKey];
-  const options = provider.models.map((m) => ({
-    label: m.default ? `${m.name} (recommended)` : m.name,
-    value: m.id,
-  }));
+  const options = provider.models.map((m) => {
+    const isRecommended = defaultModelId ? m.id === defaultModelId : m.default;
+    return {
+      label: isRecommended ? `${m.name} (recommended)` : m.name,
+      value: m.id,
+    };
+  });
   options.push({ label: 'Custom (enter model ID)', value: '__custom__' });
 
   const model = handleCancel(await clack.select({

package/setup/lib/targets.mjs

@@ -24,9 +24,6 @@ export const CONFIG_TARGETS = {
   CUSTOM_API_KEY:        { env: true, secret: 'AGENT_CUSTOM_API_KEY' },
   OPENAI_BASE_URL:       { env: true, variable: true },
 
-  AGENT_LLM_PROVIDER:     { variable: true },
-  AGENT_LLM_MODEL:        { variable: true },
-
   CLAUDE_CODE_OAUTH_TOKEN: { env: true, secret: 'AGENT_CLAUDE_CODE_OAUTH_TOKEN' },
   AGENT_BACKEND:           { env: true, variable: true },
 

package/setup/setup.mjs

@@ -32,6 +32,7 @@ import {
   generateWebhookSecret,
   getPATCreationURL,
   setSecret,
+  setVariable,
 } from './lib/github.mjs';
 import { writeModelsJson } from './lib/auth.mjs';
 import { loadEnvFile } from './lib/env.mjs';
@@ -50,7 +51,7 @@ async function main() {
   console.log(chalk.cyan(logo));
   clack.intro('Interactive Setup Wizard');
 
-  const TOTAL_STEPS = 7;
+  const TOTAL_STEPS = 8;
   let currentStep = 0;
 
   // Load existing .env (always exists after init — seed .env has AUTH_SECRET etc.)
@@ -422,7 +423,7 @@ async function main() {
       }
     } else {
       const providerConfig = PROVIDERS[chatProvider];
-      chatModel = await promptForModel(chatProvider);
+      chatModel = await promptForModel(chatProvider, { defaultModelId: 'claude-sonnet-4-6' });
       const chatApiKey = await promptForApiKey(chatProvider);
       collected[providerConfig.envKey] = chatApiKey;
 
@@ -495,8 +496,6 @@ async function main() {
       });
       if (clack.isCancel(customModel)) { clack.cancel('Setup cancelled.'); process.exit(0); }
       agentModel = customModel;
-      collected.AGENT_LLM_PROVIDER = agentProvider;
-      collected.AGENT_LLM_MODEL = agentModel;
       collected.RUNS_ON = 'self-hosted';
     } else {
       const agentProviderConfig = PROVIDERS[agentProvider];
@@ -511,9 +510,6 @@ async function main() {
         clack.log.success(`Agent ${agentProviderConfig.name} key added (${maskSecret(agentApiKey)})`);
       }
 
-      collected.AGENT_LLM_PROVIDER = agentProvider;
-      collected.AGENT_LLM_MODEL = agentModel;
-
       // OAuth prompt — only when agent provider is Anthropic
       if (agentProviderConfig.oauthSupported) {
         let skipOAuth = false;
@@ -601,15 +597,15 @@ async function main() {
     clack.log.success(`Brave Search key added (${maskSecret(braveKey)})`);
 
     // Enable brave-search skill symlink
-    const braveSymlink = path.join(process.cwd(), '.pi', 'skills', 'brave-search');
+    const braveSymlink = path.join(process.cwd(), 'skills', 'active', 'brave-search');
     if (!fs.existsSync(braveSymlink)) {
       fs.mkdirSync(path.dirname(braveSymlink), { recursive: true });
-      createDirLink('../../pi-skills/brave-search', braveSymlink);
+      createDirLink('../brave-search', braveSymlink);
       clack.log.success('Enabled brave-search skill');
 
       // Commit and push the symlink so the Docker agent can use it
       try {
-        execSync('git add .pi/skills/brave-search', { stdio: 'ignore' });
+        execSync('git add skills/active/brave-search', { stdio: 'ignore' });
         execSync('git commit -m "enable brave-search skill [no ci]"', { stdio: 'ignore' });
         const remote = execSync('git remote get-url origin', { encoding: 'utf-8' }).trim();
         const authedUrl = remote.replace('https://github.com/', `https://x-access-token:${pat}@github.com/`);
@@ -685,6 +681,15 @@ async function main() {
 
   const report = await syncConfig(env, collected, { owner, repo });
 
+  // If agent uses a different model/provider, overwrite the GitHub variable
+  // (.env keeps chatModel for the event handler, GitHub variable gets agentModel for jobs)
+  if (agentModel && agentModel !== chatModel) {
+    await setVariable(owner, repo, 'LLM_MODEL', agentModel);
+  }
+  if (agentProvider && agentProvider !== chatProvider) {
+    await setVariable(owner, repo, 'LLM_PROVIDER', agentProvider);
+  }
+
   // Set agent API key as a separate GitHub secret (not in .env)
   if (agentApiKeyInfo) {
     const s2 = clack.spinner();
@@ -700,26 +705,14 @@ async function main() {
 
   clack.log.info('Your agent includes a web chat interface at your APP_URL.');
 
-  // ─── Step 6: Build & Start Server ────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Build & Start Server`);
-  clack.log.info('Now we\'ll build your agent\'s web interface. Then you\'ll start the server with Docker so it can receive webhooks and serve the chat UI.');
-
-  // Check if server is already running
-  let serverAlreadyRunning = false;
-  try {
-    await fetch('http://localhost:80/api/ping', {
-      method: 'GET',
-      signal: AbortSignal.timeout(3000),
-    });
-    serverAlreadyRunning = true;
-  } catch {
-    // Server not reachable
-  }
+  // ─── Step 6: Build ──────────────────────────────────────────────────
+  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Build`);
 
   // Helper: run build with retry on failure
   async function runBuildWithRetry() {
     for (let attempt = 1; attempt <= 2; attempt++) {
       try {
+        fs.rmSync(path.join(process.cwd(), '.next'), { recursive: true, force: true });
         execSync('npm run build', { stdio: 'inherit' });
         clack.log.success('Build complete');
         return true;
@@ -736,43 +729,66 @@ async function main() {
     clack.log.error(
       'Cannot continue without a successful build.\n' +
       '  Fix the error above, then run:\n\n' +
-      '    npm run build\n' +
-      '    docker compose up -d'
+      '    npm run build'
     );
     process.exit(1);
   }
 
-  if (serverAlreadyRunning) {
-    clack.log.success('Server is already running');
-    if (await confirm('Rebuild and restart anyway?', false)) {
-      clack.log.info('Rebuilding Next.js...');
+  const hasExistingBuild = fs.existsSync(path.join(process.cwd(), '.next'));
+
+  if (hasExistingBuild) {
+    if (await confirm('Existing build found. Rebuild?')) {
+      clack.log.info('Building Next.js...');
       await runBuildWithRetry();
+    } else {
+      clack.log.info('Skipping build');
     }
   } else {
     clack.log.info('Building Next.js...');
     await runBuildWithRetry();
+  }
 
-    clack.log.info('Start Docker in a new terminal window:\n\n     docker compose up -d');
+  // ─── Step 7: Start Server ─────────────────────────────────────────────
+  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Start Server`);
 
-    let serverReachable = false;
-    while (!serverReachable) {
-      await pressEnter('Press enter once Docker is running');
-      const serverSpinner = clack.spinner();
-      serverSpinner.start('Checking server...');
+  let serverRunning = false;
+  try {
+    await fetch('http://localhost:80/api/ping', {
+      method: 'GET',
+      signal: AbortSignal.timeout(3000),
+    });
+    serverRunning = true;
+  } catch {
+    // Server not reachable
+  }
+
+  if (serverRunning) {
+    if (await confirm('Server is already running. Restart?')) {
+      const restartSpinner = clack.spinner();
+      restartSpinner.start('Restarting server...');
       try {
-        await fetch('http://localhost:80/api/ping', {
-          method: 'GET',
-          signal: AbortSignal.timeout(5000),
-        });
-        serverSpinner.stop('Server is running');
-        serverReachable = true;
+        execSync('docker compose down && docker compose up -d', { stdio: 'ignore' });
+        restartSpinner.stop('Server restarted');
       } catch {
-        serverSpinner.stop('Could not reach server on localhost:80');
+        restartSpinner.stop('Failed to restart server');
+        clack.log.warn('Run manually: docker compose down && docker compose up -d');
       }
     }
+  } else {
+    const startSpinner = clack.spinner();
+    startSpinner.start('Starting server...');
+    try {
+      execSync('docker compose up -d', { stdio: 'ignore' });
+      startSpinner.stop('Server started');
+    } catch {
+      startSpinner.stop('Failed to start server');
+      clack.log.warn('Run manually: docker compose up -d');
+    }
   }
 
-  // ─── Step 7: Summary ─────────────────────────────────────────────────
+  clack.log.info(`Server starting — visit ${appUrl} (may take 10-20 seconds to load)`);
+
+  // ─── Step 8: Summary ─────────────────────────────────────────────────
   clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Setup Complete!`);
 
   const chatProviderLabel = chatProvider === 'custom' ? 'Local (OpenAI Compatible API)' : PROVIDERS[chatProvider].label;
@@ -781,18 +797,15 @@ async function main() {
   summary += `Repository:   ${owner}/${repo}\n`;
   summary += `App URL:      ${appUrl}\n`;
 
-  if (agentProvider && agentProvider !== chatProvider) {
-    // Different providers for chat and agent
-    const agentProviderLabel = agentProvider === 'custom' ? 'Local (OpenAI Compatible API)' : PROVIDERS[agentProvider].label;
-    summary += `Chat LLM:     ${chatProviderLabel} (${chatModel})\n`;
-    summary += `Agent LLM:    ${agentProviderLabel} (${agentModel})\n`;
-  } else if (agentModel && agentModel !== chatModel) {
-    // Same provider, different model
-    summary += `Chat LLM:     ${chatProviderLabel} (${chatModel})\n`;
-    summary += `Agent LLM:    ${chatProviderLabel} (${agentModel})\n`;
+  if (agentProvider || agentModel) {
+    const agentProviderLabel = agentProvider
+      ? (agentProvider === 'custom' ? 'Local (OpenAI Compatible API)' : PROVIDERS[agentProvider].label)
+      : chatProviderLabel;
+    const agentModelDisplay = agentModel || chatModel;
+    summary += `Chat LLM:     ${chatProviderLabel} (${chatModel})  [.env]\n`;
+    summary += `Agent LLM:    ${agentProviderLabel} (${agentModelDisplay})  [GitHub var]\n`;
   } else {
-    // Same config for both
-    summary += `Agent LLM:    ${chatProviderLabel} (${chatModel})\n`;
+    summary += `LLM:          ${chatProviderLabel} (${chatModel})\n`;
   }
 
   if (collected.AGENT_BACKEND) {
@@ -809,11 +822,7 @@ async function main() {
     clack.log.info(`GitHub variables set: ${report.variables.join(', ')}`);
   }
 
-  clack.outro(
-    `Start your server:\n\n` +
-    `  docker compose up -d\n\n` +
-    `Then chat with your agent at ${appUrl}`
-  );
+  clack.outro(`Chat with your agent at ${appUrl}`);
 }
 
 main().catch((error) => {

package/templates/.github/workflows/run-job.yml

@@ -52,8 +52,8 @@ jobs:
           ALL_SECRETS: ${{ toJson(secrets) }}
           JOB_IMAGE_URL: ${{ vars.JOB_IMAGE_URL }}
           THEPOPEBOT_VERSION: ${{ steps.version.outputs.tag }}
-          LLM_MODEL: ${{ steps.job-config.outputs.llm_model || vars.AGENT_LLM_MODEL || vars.LLM_MODEL }}
-          LLM_PROVIDER: ${{ steps.job-config.outputs.llm_provider || vars.AGENT_LLM_PROVIDER || vars.LLM_PROVIDER }}
+          LLM_MODEL: ${{ steps.job-config.outputs.llm_model || vars.LLM_MODEL }}
+          LLM_PROVIDER: ${{ steps.job-config.outputs.llm_provider || vars.LLM_PROVIDER }}
           OPENAI_BASE_URL: ${{ vars.OPENAI_BASE_URL }}
           AGENT_BACKEND: ${{ steps.job-config.outputs.agent_backend || vars.AGENT_BACKEND || '' }}
         run: |

package/templates/.gitignore.template

@@ -6,12 +6,13 @@
 *.key
 
 .claude/*
+!.claude/skills
 
 # Pi system prompt (generated at runtime from SOUL.md)
 .pi/SYSTEM.md
 
-# Pi skills dependencies (installed at runtime in Docker for correct arch)
-pi-skills/*/node_modules/
+# Skills dependencies (installed at runtime in Docker for correct arch)
+skills/*/node_modules/
 
 # Node
 node_modules/

package/templates/CLAUDE.md.template

@@ -31,14 +31,16 @@ project-root/
 │   ├── AGENT.md                       # Agent runtime environment docs
 │   ├── JOB_SUMMARY.md                 # Prompt for summarizing completed jobs
 │   ├── HEARTBEAT.md                   # Self-monitoring / heartbeat behavior
-│   ├── PI_SKILL_GUIDE.md             # Guide for Pi agent skills
+│   ├── SKILL_BUILDING_GUIDE.md             # Guide for building agent skills
 │   ├── CRONS.json                     # Scheduled job definitions
 │   └── TRIGGERS.json                  # Webhook trigger definitions
 │
 ├── .github/workflows/                 # GitHub Actions
 ├── docker/                            # Docker files (job agent + event handler)
-├── .pi/skills/                        # Symlinks to active skills
-├── pi-skills/                         # All available Pi agent skills
+├── skills/                            # All available agent skills
+│   └── active/                        # Symlinks to active skills (shared by Pi + Claude Code)
+├── .pi/skills → skills/active         # Pi reads skills from here
+├── .claude/skills → skills/active     # Claude Code reads skills from here
 ├── cron/                              # Scripts for command-type cron actions
 ├── triggers/                          # Scripts for command-type trigger actions
 ├── logs/                              # Per-job output (logs/<JOB_ID>/job.md + session .jsonl)
@@ -290,9 +292,9 @@ SQLite via Drizzle ORM at `data/thepopebot.sqlite`. Auto-initialized and auto-mi
 
 ## Customization
 
-User-editable config files in `config/`: `SOUL.md` (personality), `EVENT_HANDLER.md` (LLM system prompt), `AGENT.md` (runtime docs), `JOB_SUMMARY.md` (job summaries), `HEARTBEAT.md` (self-monitoring), `PI_SKILL_GUIDE.md` (skill guide), `CRONS.json` (scheduled jobs), `TRIGGERS.json` (webhook triggers).
+User-editable config files in `config/`: `SOUL.md` (personality), `EVENT_HANDLER.md` (LLM system prompt), `AGENT.md` (runtime docs), `JOB_SUMMARY.md` (job summaries), `HEARTBEAT.md` (self-monitoring), `SKILL_BUILDING_GUIDE.md` (skill guide), `CRONS.json` (scheduled jobs), `TRIGGERS.json` (webhook triggers).
 
-Skills in `pi-skills/` are activated by symlinking into `.pi/skills/`. Scripts for command-type actions go in `cron/` and `triggers/`.
+Skills in `skills/` are activated by symlinking into `skills/active/`. Both `.pi/skills` and `.claude/skills` point to `skills/active/`. Scripts for command-type actions go in `cron/` and `triggers/`.
 
 ### Markdown includes and variables
 
@@ -302,4 +304,4 @@ Config markdown files support includes and built-in variables (processed by the
 |--------|-------------|
 | `{{ filepath.md }}` | Include another file (relative to project root, recursive with circular detection) |
 | `{{datetime}}` | Current ISO timestamp |
-| `{{skills}}` | Dynamic bullet list of active skill descriptions from `.pi/skills/*/SKILL.md` frontmatter — never hardcode skill names, this is resolved at runtime |
+| `{{skills}}` | Dynamic bullet list of active skill descriptions from `skills/active/*/SKILL.md` frontmatter — never hardcode skill names, this is resolved at runtime |

package/templates/config/EVENT_HANDLER.md

@@ -10,7 +10,7 @@ You have four tools:
 - **`create_job`** — dispatch a job for autonomous execution
 - **`get_job_status`** — check on running or completed jobs
 - **`get_system_technical_specs`** — read the system architecture docs (event handler, Docker agent, APIs, config, deployment). Use before planning jobs that modify system configuration.
-- **`get_pi_skill_creation_guide`** — load the Pi skill creation guide (skill format, examples, activation, testing). Use when discussing or creating skills with the user.
+- **`get_skill_building_guide`** — load the skill building guide (skill format, examples, activation, testing). Use when discussing or creating skills with the user.
 
 ---
 
@@ -29,17 +29,17 @@ These 7 tools are all Pi needs to accomplish most tasks. It can write code, inst
 ### What Pi can do with these tools
 
 - **Self-modification** — update config files in `config/` (CRONS.json, TRIGGERS.json, SOUL.md, EVENT_HANDLER.md, AGENT.md, etc.). Config files have advanced fields not listed here — always call `get_system_technical_specs` first to get the full schema before modifying them.
-- **Create new skills** — build new tools in `pi-skills/` and activate them with symlinks to `.pi/skills/`
+- **Create new skills** — build new tools in `skills/` and activate them with symlinks in `skills/active/`
 - **Code changes** — add features, fix bugs, refactor, build entire applications
 - **Git** — commits changes, creates PRs automatically
 
-### Active skills (extend Pi's abilities)
+### Active skills
 
-Skills are lightweight wrappers (usually bash scripts) that give Pi access to external services. Pi reads the skill documentation, then invokes them via bash.
+Skills are lightweight wrappers (usually bash scripts) that give the agent access to external services. The agent reads the skill documentation, then invokes them via bash.
 
 {{skills}}
 
-If no skill exists for what the user needs, Pi can build more.
+If no skill exists for what the user needs, the agent can build more.
 
 ### Writing good job descriptions
 
@@ -94,9 +94,9 @@ The job description text becomes Pi's task prompt:
 
 ## Skills
 
-Skills extend what Pi can do — they're lightweight wrappers (usually bash scripts) that give Pi access to external services. If a user wants something no current skill covers, suggest creating one.
+Skills extend what the agent can do — they're lightweight wrappers (usually bash scripts) that give the agent access to external services. If a user wants something no current skill covers, suggest creating one.
 
-When discussing or creating skills, use `get_pi_skill_creation_guide` to load the detailed skill creation guide. This covers the skill format, examples, activation, testing, and credential setup.
+When discussing or creating skills, use `get_skill_building_guide` to load the skill building guide. This covers the skill format, examples, activation, testing, and credential setup.
 
 ### Credential setup (handle in conversation, before creating the job)
 
@@ -200,12 +200,12 @@ Browser scraping:
 > Navigate to https://example.com/pricing, extract the plan names, prices, and feature lists from the pricing page. Save the data as JSON at `data/pricing.json`.
 
 New skill creation:
-> Create a new skill at `pi-skills/slack-post/`:
+> Create a new skill at `skills/slack-post/`:
 >
-> 1. Create `SKILL.md` with frontmatter (name: slack-post, description: "Post messages to Slack channels via incoming webhook.") and usage docs referencing `{baseDir}/post.sh <message>`
+> 1. Create `SKILL.md` with frontmatter (name: slack-post, description: "Post messages to Slack channels via incoming webhook.") and usage docs referencing `skills/slack-post/post.sh <message>`
 > 2. Create `post.sh` — bash script that takes a message argument, sends it to the Slack webhook URL via curl using $SLACK_WEBHOOK_URL. Make it executable.
-> 3. Activate: `ln -s ../../pi-skills/slack-post .pi/skills/slack-post`
-> 4. Test: run `post.sh "test message from thepopebot"` and verify successful delivery. Fix any issues before committing.
+> 3. Activate: `ln -s ../slack-post skills/active/slack-post`
+> 4. Test: run `skills/slack-post/post.sh "test message from thepopebot"` and verify successful delivery. Fix any issues before committing.
 
 ---
 

package/templates/config/{PI_SKILL_GUIDE.md → SKILL_BUILDING_GUIDE.md}

@@ -1,19 +1,19 @@
-# Skill Creation Guide
+# Skill Building Guide
 
 ## What is a skill?
 
-Skills are lightweight wrappers that extend Pi's abilities. They live in `pi-skills/<skill-name>/` and are activated by symlinking to `.pi/skills/`.
+Skills are lightweight wrappers that extend agent abilities. They live in `skills/<skill-name>/` and are activated by symlinking into `skills/active/`. Both Pi and Claude Code discover skills from the same shared directory.
 
 ## Skill structure
 
 - **`SKILL.md`** (required) — YAML frontmatter + markdown documentation
-- **Scripts** (optional) — prefer bash (.sh). Pi works primarily in bash.
+- **Scripts** (optional) — prefer bash (.sh) for simplicity
 - **`package.json`** (optional) — only if Node.js dependencies are truly needed
 
 ## SKILL.md format
 
-The `description` from frontmatter appears in the event handler's system prompt under "Active skills."
-The `{baseDir}` placeholder is replaced at runtime with the skill's actual directory path.
+The `description` from frontmatter appears in the system prompt under "Active skills."
+Use project-root-relative paths in documentation (e.g., `skills/<skill-name>/script.sh`).
 
 ```
 ---
@@ -26,7 +26,7 @@ description: One sentence describing what the skill does and when to use it.
 ## Usage
 
 ```bash
-{baseDir}/script.sh <args>
+skills/skill-name/script.sh <args>
 ```
 ```
 
@@ -34,7 +34,7 @@ description: One sentence describing what the skill does and when to use it.
 
 The built-in `transcribe` skill — a SKILL.md and a single bash script:
 
-**pi-skills/transcribe/SKILL.md:**
+**skills/transcribe/SKILL.md:**
 ```
 ---
 name: transcribe
@@ -50,11 +50,11 @@ Requires GROQ_API_KEY environment variable.
 
 ## Usage
 ```bash
-{baseDir}/transcribe.sh <audio-file>
+skills/transcribe/transcribe.sh <audio-file>
 ```
 ```
 
-**pi-skills/transcribe/transcribe.sh:**
+**skills/transcribe/transcribe.sh:**
 ```bash
 #!/bin/bash
 if [ -z "$1" ]; then echo "Usage: transcribe.sh <audio-file>"; exit 1; fi
@@ -68,18 +68,18 @@ curl -s -X POST "https://api.groq.com/openai/v1/audio/transcriptions" \
 
 ## Example: Skill with Node.js dependencies
 
-The built-in `brave-search` skill uses Node.js for HTML parsing (jsdom, readability, turndown). It has a `package.json` and `.js` scripts. Pi runs `npm install` in the skill directory automatically. Use this pattern only when bash + curl isn't sufficient.
+The built-in `brave-search` skill uses Node.js for HTML parsing (jsdom, readability, turndown). It has a `package.json` and `.js` scripts. Dependencies are installed automatically in Docker. Use this pattern only when bash + curl isn't sufficient.
 
 ## Activation
 
 After creating skill files, symlink to activate:
 ```bash
-ln -s ../../pi-skills/skill-name .pi/skills/skill-name
+ln -s ../skill-name skills/active/skill-name
 ```
 
 ## Always build AND test in the same job
 
-Tell Pi to test the skill with real input after creating it and fix any issues before committing. Don't create untested skills.
+Tell the agent to test the skill with real input after creating it and fix any issues before committing. Don't create untested skills.
 
 ## Credential setup
 

package/templates/docker/job-claude-code/Dockerfile

@@ -5,6 +5,10 @@ RUN apt-get update && apt-get install -y \
     jq \
     curl \
     procps \
+    libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 \
+    libcups2 libdrm2 libdbus-1-3 libxkbcommon0 \
+    libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 \
+    libxrandr2 libgbm1 libasound2 libpango-1.0-0 libcairo2 \
     && rm -rf /var/lib/apt/lists/*
 
 # Install GitHub CLI

package/templates/docker/job-claude-code/entrypoint.sh

@@ -41,6 +41,23 @@ fi
 
 cd /job
 
+# Install npm deps for active skills (native deps need correct Linux arch)
+for skill_dir in /job/skills/active/*/; do
+    if [ -f "${skill_dir}package.json" ]; then
+        echo "Installing skill deps: $(basename "$skill_dir")"
+        (cd "$skill_dir" && npm install --omit=dev --no-package-lock)
+    fi
+done
+
+# Start Chrome if puppeteer installed it (needed by browser-tools skill)
+CHROME_PID=""
+CHROME_BIN=$(find /home/agent/.cache/puppeteer -name "chrome" -type f 2>/dev/null | head -1)
+if [ -n "$CHROME_BIN" ]; then
+    $CHROME_BIN --headless --no-sandbox --disable-gpu --remote-debugging-port=9222 2>/dev/null &
+    CHROME_PID=$!
+    sleep 2
+fi
+
 # Setup logs
 LOG_DIR="/job/logs/${JOB_ID}"
 mkdir -p "${LOG_DIR}"
@@ -70,11 +87,18 @@ PROMPT="
 
 ${JOB_DESCRIPTION}"
 
+# Build --model flag if LLM_MODEL is set
+MODEL_FLAG=""
+if [ -n "$LLM_MODEL" ]; then
+    MODEL_FLAG="--model $LLM_MODEL"
+fi
+
 # Run Claude Code — capture exit code instead of letting set -e kill the script
 # stream-json gives the full conversation trace (thinking, tool calls, results)
 # similar to Pi's .jsonl session logs
 set +e
 claude -p "$PROMPT" \
+    $MODEL_FLAG \
     --append-system-prompt-file "$SYSTEM_PROMPT_FILE" \
     --dangerously-skip-permissions \
     --verbose \
@@ -98,6 +122,11 @@ fi
 git push origin
 set -e
 
+# Cleanup Chrome
+if [ -n "$CHROME_PID" ]; then
+    kill $CHROME_PID 2>/dev/null || true
+fi
+
 # Create PR (auto-merge handled by GitHub Actions workflow)
 gh pr create --title "🤖 Agent Job: ${TITLE}" --body "${JOB_DESCRIPTION}" --base main || true
 

package/templates/docker/job-pi-coding-agent/entrypoint.sh

@@ -41,8 +41,8 @@ cd /job
 # Create temp directory for agent use (gitignored via tmp/)
 mkdir -p /job/tmp
 
-# Install npm deps for symlinked skills (native deps need correct Linux arch)
-for skill_dir in /job/.pi/skills/*/; do
+# Install npm deps for active skills (native deps need correct Linux arch)
+for skill_dir in /job/skills/active/*/; do
     if [ -f "${skill_dir}package.json" ]; then
         echo "Installing skill deps: $(basename "$skill_dir")"
         (cd "$skill_dir" && npm install --omit=dev --no-package-lock)

package/templates/{pi-skills → skills}/README.md

@@ -95,10 +95,10 @@ description: Short description shown to agent
 # Instructions
 
 Detailed instructions here...
-Helper files available at: {baseDir}/
+Helper files available at: skills/skill-name/
 ```
 
-The `{baseDir}` placeholder is replaced with the skill's directory path at runtime.
+Skills use project-root-relative paths (e.g., `skills/brave-search/search.js`).
 
 ## Requirements
 

package/templates/{pi-skills → skills}/brave-search/SKILL.md

@@ -20,20 +20,20 @@ Requires a Brave Search API account with a free subscription. A credit card is r
    ```
 5. Install dependencies (run once):
    ```bash
-   cd {baseDir}
+   cd skills/brave-search
    npm install
    ```
 
 ## Search
 
 ```bash
-{baseDir}/search.js "query"                         # Basic search (5 results)
-{baseDir}/search.js "query" -n 10                   # More results (max 20)
-{baseDir}/search.js "query" --content               # Include page content as markdown
-{baseDir}/search.js "query" --freshness pw          # Results from last week
-{baseDir}/search.js "query" --freshness 2024-01-01to2024-06-30  # Date range
-{baseDir}/search.js "query" --country DE            # Results from Germany
-{baseDir}/search.js "query" -n 3 --content          # Combined options
+skills/brave-search/search.js "query"                         # Basic search (5 results)
+skills/brave-search/search.js "query" -n 10                   # More results (max 20)
+skills/brave-search/search.js "query" --content               # Include page content as markdown
+skills/brave-search/search.js "query" --freshness pw          # Results from last week
+skills/brave-search/search.js "query" --freshness 2024-01-01to2024-06-30  # Date range
+skills/brave-search/search.js "query" --country DE            # Results from Germany
+skills/brave-search/search.js "query" -n 3 --content          # Combined options
 ```
 
 ### Options
@@ -51,7 +51,7 @@ Requires a Brave Search API account with a free subscription. A credit card is r
 ## Extract Page Content
 
 ```bash
-{baseDir}/content.js https://example.com/article
+skills/brave-search/content.js https://example.com/article
 ```
 
 Fetches a URL and extracts readable content as markdown.

package/templates/{pi-skills → skills}/browser-tools/SKILL.md

@@ -12,15 +12,15 @@ Chrome DevTools Protocol tools for agent-assisted web automation. These tools co
 Run once before first use:
 
 ```bash
-cd {baseDir}/browser-tools
+cd skills/browser-tools
 npm install
 ```
 
 ## Start Chrome
 
 ```bash
-{baseDir}/browser-start.js              # Fresh profile
-{baseDir}/browser-start.js --profile    # Copy user's profile (cookies, logins)
+skills/browser-tools/browser-start.js              # Fresh profile
+skills/browser-tools/browser-start.js --profile    # Copy user's profile (cookies, logins)
 ```
 
 Launch Chrome with remote debugging on `:9222`. Use `--profile` to preserve user's authentication state.
@@ -28,8 +28,8 @@ Launch Chrome with remote debugging on `:9222`. Use `--profile` to preserve user
 ## Navigate
 
 ```bash
-{baseDir}/browser-nav.js https://example.com
-{baseDir}/browser-nav.js https://example.com --new
+skills/browser-tools/browser-nav.js https://example.com
+skills/browser-tools/browser-nav.js https://example.com --new
 ```
 
 Navigate to URLs. Use `--new` flag to open in a new tab instead of reusing current tab.
@@ -37,8 +37,8 @@ Navigate to URLs. Use `--new` flag to open in a new tab instead of reusing curre
 ## Evaluate JavaScript
 
 ```bash
-{baseDir}/browser-eval.js 'document.title'
-{baseDir}/browser-eval.js 'document.querySelectorAll("a").length'
+skills/browser-tools/browser-eval.js 'document.title'
+skills/browser-tools/browser-eval.js 'document.querySelectorAll("a").length'
 ```
 
 Execute JavaScript in the active tab. Code runs in async context. Use this to extract data, inspect page state, or perform DOM operations programmatically.
@@ -46,7 +46,7 @@ Execute JavaScript in the active tab. Code runs in async context. Use this to ex
 ## Screenshot
 
 ```bash
-{baseDir}/browser-screenshot.js
+skills/browser-tools/browser-screenshot.js
 ```
 
 Capture current viewport and return temporary file path. Use this to visually inspect page state or verify UI changes.
@@ -54,7 +54,7 @@ Capture current viewport and return temporary file path. Use this to visually in
 ## Pick Elements
 
 ```bash
-{baseDir}/browser-pick.js "Click the submit button"
+skills/browser-tools/browser-pick.js "Click the submit button"
 ```
 
 **IMPORTANT**: Use this tool when the user wants to select specific DOM elements on the page. This launches an interactive picker that lets the user click elements to select them. The user can select multiple elements (Cmd/Ctrl+Click) and press Enter when done. The tool returns CSS selectors for the selected elements.
@@ -67,7 +67,7 @@ Common use cases:
 ## Cookies
 
 ```bash
-{baseDir}/browser-cookies.js
+skills/browser-tools/browser-cookies.js
 ```
 
 Display all cookies for the current tab including domain, path, httpOnly, and secure flags. Use this to debug authentication issues or inspect session state.
@@ -75,7 +75,7 @@ Display all cookies for the current tab including domain, path, httpOnly, and se
 ## Extract Page Content
 
 ```bash
-{baseDir}/browser-content.js https://example.com
+skills/browser-tools/browser-content.js https://example.com
 ```
 
 Navigate to a URL and extract readable content as markdown. Uses Mozilla Readability for article extraction and Turndown for HTML-to-markdown conversion. Works on pages with JavaScript content (waits for page to load).
@@ -174,7 +174,7 @@ Extract structured state in one call:
 If DOM updates after actions, add a small delay with bash:
 
 ```bash
-sleep 0.5 && {baseDir}/browser-eval.js '...'
+sleep 0.5 && skills/browser-tools/browser-eval.js '...'
 ```
 
 ### Investigate Before Interacting

package/templates/{pi-skills → skills}/browser-tools/browser-start.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn, execSync } from "node:child_process";
-import puppeteer from "puppeteer-core";
+import puppeteer from "puppeteer";
 
 const useProfile = process.argv[2] === "--profile";
 
@@ -51,8 +51,9 @@ if (useProfile) {
 }
 
 // Start Chrome with flags to force new instance
+const chromePath = puppeteer.executablePath();
 spawn(
-	"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+	chromePath,
 	[
 		"--remote-debugging-port=9222",
 		`--user-data-dir=${SCRAPING_DIR}`,

package/templates/{.pi/skills → skills}/llm-secrets/SKILL.md

@@ -6,7 +6,7 @@ description: List available LLM-accessible credentials. Use when you need API ke
 # List Available Secrets
 
 ```bash
-/job/.pi/skills/llm-secrets/llm-secrets.js
+skills/llm-secrets/llm-secrets.js
 ```
 
 Shows the names of available secret keys (not values). Output example:

package/templates/{.pi/skills → skills}/modify-self/SKILL.md

@@ -8,5 +8,5 @@ description: Use when a job requires modifying the agent's own code, configurati
 Before making any changes, read the project documentation for a full understanding of the system architecture:
 
 ```bash
-cat /job/CLAUDE.md
+cat CLAUDE.md
 ```