@openchambery/web 1.19.7-beta.25 → 1.19.7-beta.27

package/server/lib/assistants/harness.js

@@ -14,6 +14,12 @@ import {
   parseContactToolCalls,
   stripContactToolFences,
 } from './contact-tools.js';
+import {
+  createPiCodingRuntime,
+  formatPiCodingPrompt,
+  isPiCodingToolName,
+  resolveAssistantCwd,
+} from './pi-tools.js';
 
 function createAssistantMessageEventStream() {
   const events = [];
@@ -63,17 +69,16 @@ function createAssistantMessageEventStream() {
 }
 
 export const CONTACT_SYSTEM_PROMPT = [
-  "You are OpenChamber's in-app assistant — a personable contact, not a coding agent.",
+  "You are OpenChamber's in-app assistant — a personable contact who can also work in the user's configured project directory.",
   'Reply in short chat bubbles: a few sentences each, separated by a blank line.',
   'Talk like a person in the user\'s language. One short spoken bubble at a time — never a wall of paragraphs.',
   'Never write chain-of-thought, plans, tool names, or English narration of what you will do. The user never sees thinking.',
   'Do not expose tool traces, Activity, or editor actions.',
-  'Do not run bash, edit, read, or write.',
+  'You have bash, read, write, and edit in the working directory. Use them for pwd, files, and shell. Never say you have no terminal or cannot read files. Ignore any temporary generator workspace in the environment.',
   'Understand natural language in any language, including Chinese: 开新对话 means new_conversation, 找项目 means list_projects, 现有对话 means list_sessions, 建助理 means create_assistant, 建会话 / 开个新会话 means assign_session, 排定时任务 means schedule_task, 给 X 说一声 means message_assistant, 发卡片 means emit a card via those tools — never ask the user to type /card or /dm.',
   'You receive the registered project catalog every turn. You CAN see those projects. Look them up yourself (fuzzy match label/name/path). Never say you cannot see the registered project list. Never ask for a raw filesystem path when a name matches. If the catalog is empty, tell the user to add a project in Settings.',
-  'To open coding work: match the project, optionally list_sessions for existing chats, then assign_session with projectPath or sessionID.',
+  'File and shell work in this working directory uses read, write, edit, and bash. To open a separate Chat coding session: match the project, optionally list_sessions for existing chats, then assign_session with projectPath or sessionID.',
   'A reply without the tool call does nothing. Never say 已创建, created, scheduled, or opened unless the tool already returned success.',
-  'Assign coding work with assign_session so a real Chat session does the work.',
 ].join(' ');
 
 const emptyUsage = () => ({
@@ -418,9 +423,13 @@ const extractContactTurnOutcome = (messages, retried) => {
   const cards = extractContactCardsFromMessages(slice);
   const hasTool = contactTurnHasToolResult(slice);
   const spoken = extractSpokenPreamble(slice);
-  const confirm = hasTool
-    ? (extractToolResultText(slice) || extractAssistantText(slice))
-    : extractAssistantText(slice);
+  const lastToolName = [...slice].reverse().find((message) => message?.role === 'toolResult')?.toolName;
+  const coding = isPiCodingToolName(lastToolName);
+  const toolText = extractToolResultText(slice);
+  const assistant = extractAssistantText(slice);
+  const confirm = hasTool && !coding
+    ? (toolText || assistant)
+    : (assistant || (coding ? toolText : ''));
   const parts = [];
   if (spoken) parts.push(spoken);
   if (confirm && confirm !== spoken) parts.push(confirm);
@@ -428,9 +437,10 @@ const extractContactTurnOutcome = (messages, retried) => {
 };
 
 /**
- * Thin OpenChamber contact harness: pi-agent-core Agent + OpenChamber API
- * tools only + thinkingLevel off. Transcript in, completions via streamFn,
- * bubbles and session cards out. Never bash/edit/read/write.
+ * Thin OpenChamber contact harness: pi-agent-core Agent + thinkingLevel off.
+ * Attaches pi read/write/edit/bash in the assistant workspace plus OpenChamber
+ * API tools. Transcript in, completions via streamFn, bubbles and session
+ * cards out.
  *
  * Assigned-session settle reuses the assistants event hub plus session-goal
  * `emitGoalNotification` — read-only into the contact transcript.
@@ -446,106 +456,120 @@ export async function runContactTurn({
   onTextDelta = null,
   onBubbleDelta = null,
   globalEventHub = null,
+  skillHomeDir,
   AgentImpl = Agent,
 }) {
   const providerID = assistant.providerID;
   const modelID = assistant.modelID;
+  const cwd = resolveAssistantCwd(assistant);
   const contactTools = Array.isArray(tools)
-    ? tools.filter((tool) => tool && typeof tool.name === 'string' && !['bash', 'edit', 'read', 'write'].includes(tool.name))
+    ? tools.filter((tool) => tool && typeof tool.name === 'string' && !isPiCodingToolName(tool.name))
     : [];
-  const systemPrompt = [
-    CONTACT_SYSTEM_PROMPT,
-    formatRegisteredProjectsPrompt(projects),
-    formatContactToolsPrompt(contactTools),
-    assistant.defaultPrompt,
-  ].filter((value) => typeof value === 'string' && value.trim()).join('\n\n');
-  const model = createContactModel(providerID, modelID);
-  // streamFn receives the model; completions needs providerID/modelID.
-  model.name = `${providerID}/${modelID}`;
+  let runtime = null;
+  try {
+    if (cwd) runtime = await createPiCodingRuntime(cwd, { homeDir: skillHomeDir });
+    const codingTools = Array.isArray(runtime?.tools) ? runtime.tools : [];
+    const systemPrompt = [
+      CONTACT_SYSTEM_PROMPT,
+      formatPiCodingPrompt({ cwd: runtime?.cwd, skillsPrompt: runtime?.skillsPrompt }),
+      formatRegisteredProjectsPrompt(projects),
+      formatContactToolsPrompt(contactTools),
+      assistant.defaultPrompt,
+    ].filter((value) => typeof value === 'string' && value.trim()).join('\n\n');
+    const model = createContactModel(providerID, modelID);
+    // streamFn receives the model; completions needs providerID/modelID.
+    model.name = `${providerID}/${modelID}`;
 
-  const pendingFileParts = [
-    ...(Array.isArray(history) ? history.flatMap((message) => completionFileParts(message.parts)) : []),
-    ...completionFileParts(userParts),
-  ];
-  const prior = Array.isArray(history)
-    ? history.map((message) => (
-      message.role === 'assistant'
-        ? { role: 'assistant', content: [{ type: 'text', text: message.content }], api: model.api, provider: model.provider, model: model.id, usage: emptyUsage(), stopReason: 'stop', timestamp: Date.now() }
-        : {
-          role: 'user',
-          content: message.content,
-          ...(completionFileParts(message.parts).length > 0 ? { parts: completionFileParts(message.parts) } : {}),
-          timestamp: Date.now(),
-        }
-    ))
-    : [];
+    const pendingFileParts = [
+      ...(Array.isArray(history) ? history.flatMap((message) => completionFileParts(message.parts)) : []),
+      ...completionFileParts(userParts),
+    ];
+    const prior = Array.isArray(history)
+      ? history.map((message) => (
+        message.role === 'assistant'
+          ? { role: 'assistant', content: [{ type: 'text', text: message.content }], api: model.api, provider: model.provider, model: model.id, usage: emptyUsage(), stopReason: 'stop', timestamp: Date.now() }
+          : {
+            role: 'user',
+            content: message.content,
+            ...(completionFileParts(message.parts).length > 0 ? { parts: completionFileParts(message.parts) } : {}),
+            timestamp: Date.now(),
+          }
+      ))
+      : [];
 
-  const agent = new AgentImpl({
-    initialState: {
-      systemPrompt,
-      model,
-      thinkingLevel: 'off',
-      tools: contactTools,
-      messages: prior,
-    },
-    streamFn: createContactStreamFn(createChatCompletion, {
-      pendingFileParts,
-      onTextDelta,
-      onBubbleDelta,
-      globalEventHub,
-      bubbleGapMs: 280,
-    }),
-  });
+    const agent = new AgentImpl({
+      initialState: {
+        systemPrompt,
+        model,
+        thinkingLevel: 'off',
+        tools: [...codingTools, ...contactTools],
+        messages: prior,
+      },
+      streamFn: createContactStreamFn(createChatCompletion, {
+        pendingFileParts,
+        onTextDelta,
+        onBubbleDelta,
+        globalEventHub,
+        bubbleGapMs: 280,
+      }),
+    });
 
-  await agent.prompt(userText);
-  if (agent.state.errorMessage) {
-    const error = new Error(agent.state.errorMessage);
-    error.code = 'upstream_error';
-    throw error;
-  }
-  const requested = detectRequestedContactTools(userText, contactTools.map((tool) => tool.name));
-  let retried = false;
-  if (requested.length > 0 && !contactTurnHasToolResult(agent.state.messages)) {
-    retried = true;
-    await agent.prompt(MISSED_FENCE_RETRY_USER_TEXT);
+    await agent.prompt(userText);
     if (agent.state.errorMessage) {
       const error = new Error(agent.state.errorMessage);
       error.code = 'upstream_error';
       throw error;
     }
-  }
-  if (requested.length > 0 && !contactTurnHasToolResult(agent.state.messages)) {
-    return {
-      text: MISSED_TOOL_FAILURE_BUBBLE,
-      bubbles: [MISSED_TOOL_FAILURE_BUBBLE],
-      cards: [],
-      thinkingLevel: agent.state.thinkingLevel,
-      tools: [...agent.state.tools],
-    };
-  }
-  const outcome = extractContactTurnOutcome(agent.state.messages, retried);
-  const text = stripContactToolFences(outcome.text);
-  if (contactTurnHasSuccessfulReset(agent.state.messages)) {
-    const bubbles = confirmBubbleAfterContactReset(splitContactBubbles(text));
+    const requested = detectRequestedContactTools(userText, contactTools.map((tool) => tool.name));
+    let retried = false;
+    if (requested.length > 0 && !contactTurnHasToolResult(agent.state.messages)) {
+      retried = true;
+      await agent.prompt(MISSED_FENCE_RETRY_USER_TEXT);
+      if (agent.state.errorMessage) {
+        const error = new Error(agent.state.errorMessage);
+        error.code = 'upstream_error';
+        throw error;
+      }
+    }
+    if (requested.length > 0 && !contactTurnHasToolResult(agent.state.messages)) {
+      return {
+        text: MISSED_TOOL_FAILURE_BUBBLE,
+        bubbles: [MISSED_TOOL_FAILURE_BUBBLE],
+        cards: [],
+        thinkingLevel: agent.state.thinkingLevel,
+        tools: [...agent.state.tools],
+      };
+    }
+    const outcome = extractContactTurnOutcome(agent.state.messages, retried);
+    const text = stripContactToolFences(outcome.text);
+    if (contactTurnHasSuccessfulReset(agent.state.messages)) {
+      const bubbles = confirmBubbleAfterContactReset(splitContactBubbles(text));
+      return {
+        text: bubbles[0] || NEW_CONVERSATION_CONFIRM_BUBBLE,
+        bubbles,
+        cards: [],
+        reset: true,
+        thinkingLevel: agent.state.thinkingLevel,
+        tools: [...agent.state.tools],
+      };
+    }
+    if (!text.trim() && outcome.cards.length === 0) {
+      const error = new Error('Assistant returned no text');
+      error.code = 'upstream_error';
+      throw error;
+    }
     return {
-      text: bubbles[0] || NEW_CONVERSATION_CONFIRM_BUBBLE,
-      bubbles,
-      cards: [],
-      reset: true,
+      text,
+      bubbles: splitContactBubbles(text),
+      cards: outcome.cards,
       thinkingLevel: agent.state.thinkingLevel,
       tools: [...agent.state.tools],
     };
+  } finally {
+    try {
+      await runtime?.close?.();
+    } catch {
+      // Workspace shell cleanup must not mask the turn result.
+    }
   }
-  if (!text.trim() && outcome.cards.length === 0) {
-    const error = new Error('Assistant returned no text');
-    error.code = 'upstream_error';
-    throw error;
-  }
-  return {
-    text,
-    bubbles: splitContactBubbles(text),
-    cards: outcome.cards,
-    thinkingLevel: agent.state.thinkingLevel,
-    tools: [...agent.state.tools],
-  };
 }

package/server/lib/assistants/harness.test.js

@@ -1,3 +1,6 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import {
   CREATE_ASSISTANT_TOOL_NAME,
@@ -9,6 +12,7 @@ import {
   createContactTools,
 } from './contact-tools.js'
 import { createContactStreamFn, runContactTurn } from './harness.js'
+import { PI_CODING_TOOL_NAMES } from './pi-tools.js'
 
 describe('createContactStreamFn', () => {
   it('forwards completion text as pi-ai text events', async () => {
@@ -232,6 +236,92 @@ describe('runContactTurn', () => {
     expect(prompt).toHaveBeenCalled()
   })
 
+  it('applies workspace, defaultPrompt, pi tools, and merged .agents/.claude skills', async () => {
+    const workspace = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-assistant-ws-'))
+    const home = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-assistant-home-'))
+    const skill = path.join(workspace, '.agents', 'skills', 'project-skill')
+    const claude = path.join(workspace, '.claude', 'skills', 'claude-skill')
+    const globalAgents = path.join(home, '.agents', 'skills', 'global-skill')
+    fs.mkdirSync(skill, { recursive: true })
+    fs.mkdirSync(claude, { recursive: true })
+    fs.mkdirSync(globalAgents, { recursive: true })
+    fs.writeFileSync(path.join(skill, 'SKILL.md'), '---\nname: project-skill\ndescription: Project skill\n---\nDo the project thing\n')
+    fs.writeFileSync(path.join(claude, 'SKILL.md'), '---\nname: claude-skill\ndescription: Claude project skill\n---\nDo the claude thing\n')
+    fs.writeFileSync(path.join(globalAgents, 'SKILL.md'), '---\nname: global-skill\ndescription: Global agents skill\n---\nDo the global thing\n')
+    function AgentImpl(options) {
+      expect(options.initialState.thinkingLevel).toBe('off')
+      expect(options.initialState.tools.map((tool) => tool.name)).toEqual([...PI_CODING_TOOL_NAMES])
+      expect(options.initialState.systemPrompt).toContain(workspace)
+      expect(options.initialState.systemPrompt).toContain('Be terse.')
+      expect(options.initialState.systemPrompt).toContain('project-skill')
+      expect(options.initialState.systemPrompt).toContain('claude-skill')
+      expect(options.initialState.systemPrompt).toContain('global-skill')
+      expect(options.initialState.systemPrompt).toContain('Never say you have no terminal')
+      this.state = { ...options.initialState, messages: [{ role: 'assistant', content: [{ type: 'text', text: 'Ready.' }] }] }
+      this.prompt = async () => {}
+    }
+    try {
+      const result = await runContactTurn({
+        assistant: {
+          providerID: 'openai',
+          modelID: 'gpt-5.2',
+          defaultPrompt: 'Be terse.',
+          effectiveWorkspacePath: workspace,
+        },
+        history: [],
+        userText: 'pwd',
+        createChatCompletion: vi.fn(),
+        skillHomeDir: home,
+        AgentImpl,
+      })
+      expect(result.bubbles).toEqual(['Ready.'])
+    } finally {
+      fs.rmSync(workspace, { recursive: true, force: true })
+      fs.rmSync(home, { recursive: true, force: true })
+    }
+  })
+
+  it('executes bash pwd in the assistant workspace', async () => {
+    const workspace = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-assistant-pwd-'))
+    const home = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-assistant-pwd-home-'))
+    let calls = 0
+    const createChatCompletion = vi.fn(async ({ body }) => {
+      calls += 1
+      if (calls === 1) {
+        return {
+          completion: {
+            choices: [{
+              message: { content: '```openchamber-tool\n{"name":"bash","arguments":{"command":"pwd"}}\n```' },
+            }],
+          },
+        }
+      }
+      const last = body.messages.at(-1)
+      const content = typeof last?.content === 'string' ? last.content : ''
+      return { completion: { choices: [{ message: { content: content || 'done' } }] } }
+    })
+    try {
+      const result = await runContactTurn({
+        assistant: {
+          providerID: 'openai',
+          modelID: 'gpt-5.2',
+          defaultPrompt: '',
+          effectiveWorkspacePath: workspace,
+        },
+        history: [],
+        userText: 'pwd',
+        createChatCompletion,
+        skillHomeDir: home,
+      })
+      const text = result.bubbles.join('\n')
+      const resolved = fs.realpathSync(workspace)
+      expect(text.includes(workspace) || text.includes(resolved)).toBe(true)
+    } finally {
+      fs.rmSync(workspace, { recursive: true, force: true })
+      fs.rmSync(home, { recursive: true, force: true })
+    }
+  })
+
   it('attaches OpenChamber tools only and collects session cards from tool results', async () => {
     const assignTool = {
       name: 'assign_session',
@@ -285,7 +375,7 @@ describe('runContactTurn', () => {
       userText: 'assign login',
       createChatCompletion: vi.fn(),
       tools: [assignTool, { name: 'bash', execute: vi.fn() }],
-      projects: [{ id: 'proj_yee', path: '/repo/openchamber-yee', label: 'OpenChamber Yee' }],
+      projects: [{ id: 'proj_yee', path: '/repo/sample-app', label: 'OpenChamber Yee' }],
       AgentImpl,
     })
     expect(result.bubbles).toEqual(['opened'])
@@ -382,7 +472,7 @@ describe('runContactTurn', () => {
     function AgentImpl(options) {
       expect(options.initialState.systemPrompt).toContain('Registered projects')
       expect(options.initialState.systemPrompt).toContain('OpenChamber Yee')
-      expect(options.initialState.systemPrompt).toContain('/repo/openchamber-yee')
+      expect(options.initialState.systemPrompt).toContain('/repo/sample-app')
       expect(options.initialState.systemPrompt).toContain('never say you cannot see registered projects')
       this.state = { ...options.initialState, messages: [{ role: 'assistant', content: [{ type: 'text', text: 'Found it.' }] }] }
       this.prompt = async () => {}
@@ -392,7 +482,7 @@ describe('runContactTurn', () => {
       history: [],
       userText: '找 openchamber yee',
       createChatCompletion: vi.fn(),
-      projects: [{ id: 'proj_yee', path: '/repo/openchamber-yee', label: 'OpenChamber Yee' }],
+      projects: [{ id: 'proj_yee', path: '/repo/sample-app', label: 'OpenChamber Yee' }],
       AgentImpl,
     })
     expect(result.bubbles).toEqual(['Found it.'])

package/server/lib/assistants/pi-tools.js

@@ -0,0 +1,118 @@
+import os from 'node:os';
+import path from 'node:path';
+import {
+  createBashTool,
+  createEditTool,
+  createReadTool,
+  createWriteTool,
+  formatSkillsForSystemPrompt,
+  loadSkills,
+} from '@earendil-works/pi-agent-core';
+import { NodeExecutionEnv } from '@earendil-works/pi-agent-core/node';
+
+const EXTERNAL_SKILL_ROOTS = Object.freeze(['.claude', '.agents']);
+
+export const PI_CODING_TOOL_NAMES = Object.freeze(['read', 'write', 'edit', 'bash']);
+const PI_CODING_TOOL_NAME_SET = new Set(PI_CODING_TOOL_NAMES);
+
+export function isPiCodingToolName(name) {
+  return typeof name === 'string' && PI_CODING_TOOL_NAME_SET.has(name);
+}
+
+export function resolveAssistantCwd(assistant) {
+  for (const value of [assistant?.effectiveWorkspacePath, assistant?.workspacePath]) {
+    if (typeof value === 'string' && value.trim()) return value.trim();
+  }
+  return null;
+}
+
+/** Global ~/.claude/skills + ~/.agents/skills, then this project cwd (.claude then .agents). Later dirs win on name. */
+export function collectAssistantSkillDirectories(cwd, { homeDir = os.homedir() } = {}) {
+  const dirs = [];
+  const seen = new Set();
+  const push = (dir) => {
+    if (typeof dir !== 'string' || !dir.trim()) return;
+    const resolved = path.resolve(dir);
+    if (seen.has(resolved)) return;
+    seen.add(resolved);
+    dirs.push(resolved);
+  };
+  const home = typeof homeDir === 'string' && homeDir.trim() ? path.resolve(homeDir.trim()) : os.homedir();
+  for (const root of EXTERNAL_SKILL_ROOTS) {
+    push(path.join(home, root, 'skills'));
+  }
+  if (typeof cwd === 'string' && cwd.trim()) {
+    const project = path.resolve(cwd.trim());
+    for (const root of EXTERNAL_SKILL_ROOTS) {
+      push(path.join(project, root, 'skills'));
+    }
+  }
+  return dirs;
+}
+
+export function mergeSkillsByName(skills) {
+  const map = new Map();
+  for (const skill of Array.isArray(skills) ? skills : []) {
+    const name = typeof skill?.name === 'string' ? skill.name.trim() : '';
+    if (!name) continue;
+    map.set(name, skill);
+  }
+  return [...map.values()];
+}
+
+const bindHarnessTool = (tool, context) => ({
+  name: tool.name,
+  label: tool.label,
+  description: tool.description,
+  parameters: tool.parameters,
+  execute: (toolCallId, params, signal, onUpdate) => (
+    tool.execute(toolCallId, params, signal, onUpdate, context)
+  ),
+});
+
+export function formatPiCodingPrompt({ cwd, skillsPrompt = '' } = {}) {
+  if (typeof cwd !== 'string' || !cwd.trim()) return '';
+  return [
+    `Working directory: ${cwd}`,
+    'You have pi coding tools in this directory: read, write, edit, bash.',
+    'This is your working directory. Ignore any other cwd from the environment, including temporary generator workspaces under /var/folders or os.tmpdir.',
+    'When the user asks pwd, the current directory, or to look at files, call bash/read yourself. Never say you have no terminal or cannot read or write files.',
+    'Skills are merged from ~/.claude/skills, ~/.agents/skills, and this project\'s .claude/skills plus .agents/skills (project wins on name). Read a skill file when the task matches its description.',
+    'Call these tools with the same fenced JSON as other tools:',
+    '```openchamber-tool',
+    '{"name":"bash","arguments":{"command":"pwd"}}',
+    '```',
+    '```openchamber-tool',
+    '{"name":"read","arguments":{"path":".agents/skills/example/SKILL.md"}}',
+    '```',
+    typeof skillsPrompt === 'string' && skillsPrompt.trim() ? skillsPrompt.trim() : '',
+  ].filter(Boolean).join('\n');
+}
+
+export async function createPiCodingRuntime(cwd, { homeDir = os.homedir() } = {}) {
+  if (typeof cwd !== 'string' || !cwd.trim()) return null;
+  const resolved = cwd.trim();
+  const env = new NodeExecutionEnv({ cwd: resolved });
+  const context = { env };
+  const tools = [
+    bindHarnessTool(createReadTool(), context),
+    bindHarnessTool(createWriteTool(), context),
+    bindHarnessTool(createEditTool(), context),
+    bindHarnessTool(createBashTool(), context),
+  ];
+  let skillsPrompt = '';
+  try {
+    const loaded = await loadSkills(env, collectAssistantSkillDirectories(resolved, { homeDir }));
+    skillsPrompt = formatSkillsForSystemPrompt(mergeSkillsByName(loaded?.skills));
+  } catch {
+    skillsPrompt = '';
+  }
+  return {
+    cwd: resolved,
+    tools,
+    skillsPrompt,
+    close: async () => {
+      await env.cleanup();
+    },
+  };
+}

package/server/lib/assistants/pi-tools.test.js

@@ -0,0 +1,114 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import {
+  collectAssistantSkillDirectories,
+  createPiCodingRuntime,
+  mergeSkillsByName,
+  PI_CODING_TOOL_NAMES,
+  resolveAssistantCwd,
+} from './pi-tools.js';
+
+const temps = [];
+const temp = () => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-pi-tools-'));
+  temps.push(dir);
+  return dir;
+};
+const writeSkill = (root, name, description = `${name} skill`) => {
+  const dir = path.join(root, name);
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(path.join(dir, 'SKILL.md'), `---\nname: ${name}\ndescription: ${description}\n---\nInstructions for ${name}\n`);
+};
+
+afterEach(() => {
+  while (temps.length > 0) {
+    fs.rmSync(temps.pop(), { recursive: true, force: true });
+  }
+});
+
+describe('resolveAssistantCwd', () => {
+  it('prefers effectiveWorkspacePath over workspacePath', () => {
+    expect(resolveAssistantCwd({
+      effectiveWorkspacePath: '/effective',
+      workspacePath: '/workspace',
+    })).toBe('/effective');
+    expect(resolveAssistantCwd({ workspacePath: '/workspace' })).toBe('/workspace');
+    expect(resolveAssistantCwd({ defaultPrompt: 'x' })).toBeNull();
+  });
+});
+
+describe('collectAssistantSkillDirectories', () => {
+  it('lists global ~/.claude and ~/.agents then project .claude and .agents', () => {
+    const home = temp();
+    const cwd = temp();
+    expect(collectAssistantSkillDirectories(cwd, { homeDir: home })).toEqual([
+      path.resolve(home, '.claude', 'skills'),
+      path.resolve(home, '.agents', 'skills'),
+      path.resolve(cwd, '.claude', 'skills'),
+      path.resolve(cwd, '.agents', 'skills'),
+    ]);
+  });
+
+  it('does not invent skill roots on intermediate parent folders', () => {
+    const home = temp();
+    const root = temp();
+    const nested = path.join(root, 'apps', 'web');
+    fs.mkdirSync(nested, { recursive: true });
+    expect(collectAssistantSkillDirectories(nested, { homeDir: home })).toEqual([
+      path.resolve(home, '.claude', 'skills'),
+      path.resolve(home, '.agents', 'skills'),
+      path.resolve(nested, '.claude', 'skills'),
+      path.resolve(nested, '.agents', 'skills'),
+    ]);
+  });
+});
+
+describe('mergeSkillsByName', () => {
+  it('keeps the last skill with the same name', () => {
+    expect(mergeSkillsByName([
+      { name: 'shared', filePath: '/global' },
+      { name: 'shared', filePath: '/project' },
+      { name: 'other', filePath: '/other' },
+    ])).toEqual([
+      { name: 'shared', filePath: '/project' },
+      { name: 'other', filePath: '/other' },
+    ]);
+  });
+});
+
+describe('createPiCodingRuntime', () => {
+  it('installs read/write/edit/bash and merges global plus project skills', async () => {
+    const home = temp();
+    const cwd = temp();
+    writeSkill(path.join(home, '.claude', 'skills'), 'claude-global', 'Claude global');
+    writeSkill(path.join(home, '.agents', 'skills'), 'agents-global', 'Agents global');
+    writeSkill(path.join(cwd, '.claude', 'skills'), 'claude-project', 'Claude project');
+    writeSkill(path.join(cwd, '.agents', 'skills'), 'project-skill', 'Project skill');
+    writeSkill(path.join(home, '.agents', 'skills'), 'shared', 'Global shared');
+    writeSkill(path.join(cwd, '.agents', 'skills'), 'shared', 'Project shared');
+
+    const runtime = await createPiCodingRuntime(cwd, { homeDir: home });
+    expect(runtime.tools.map((tool) => tool.name)).toEqual([...PI_CODING_TOOL_NAMES]);
+    expect(runtime.skillsPrompt).toContain('claude-global');
+    expect(runtime.skillsPrompt).toContain('agents-global');
+    expect(runtime.skillsPrompt).toContain('claude-project');
+    expect(runtime.skillsPrompt).toContain('project-skill');
+    expect(runtime.skillsPrompt).toContain('Project shared');
+    expect(runtime.skillsPrompt).not.toContain('Global shared');
+    await runtime.close();
+  });
+
+  it('runs bash pwd in the workspace', async () => {
+    const cwd = temp();
+    const home = temp();
+    const runtime = await createPiCodingRuntime(cwd, { homeDir: home });
+    const bash = runtime.tools.find((tool) => tool.name === 'bash');
+    const result = await bash.execute('call_pwd', { command: 'pwd' });
+    const text = result.content.map((part) => part.text).join('');
+    const resolved = fs.realpathSync(cwd);
+    expect(text.includes(cwd) || text.includes(resolved)).toBe(true);
+    await runtime.close();
+  });
+});

package/server/lib/assistants/service.test.js

@@ -1008,7 +1008,7 @@ describe('assistants service', () => {
 
   it('injects registered projects into the contact turn and assigns after a name match', async () => {
     const directory = root();
-    const project = path.join(directory, 'openchamber-yee');
+    const project = path.join(directory, 'sample-app');
     fs.mkdirSync(project, { recursive: true });
     const creates = [];
     const harness = [];