npm - @openchambery/web - Versions diffs - 1.19.7 → 1.19.8-beta.1 - Mend

@openchambery/web 1.19.7 → 1.19.8-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

package/dist/mini-chat.html CHANGED Viewed

@@ -74,7 +74,7 @@
       }
     </style>
-    <script type="module" crossorigin src="/assets/miniChat-CBLbFpfy.js"></script>
+    <script type="module" crossorigin src="/assets/miniChat-CFBgCVoZ.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-base-ui-CnHfUmDN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-zustand-B4dlGEM2.js">
@@ -91,7 +91,7 @@
     <link rel="modulepreload" crossorigin href="/assets/terminalApi-947l7Ra3.js">
     <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
     <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DCowZ2ab.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-B4eb4ZiU.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-CcIqxMFB.js">
     <link rel="stylesheet" crossorigin href="/assets/src-DasvfkEg.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/dist/mobile.html CHANGED Viewed

@@ -63,7 +63,7 @@
       })();
     </script>
-    <script type="module" crossorigin src="/assets/mobile-CoZsWdWk.js"></script>
+    <script type="module" crossorigin src="/assets/mobile-DcZkxRBz.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-base-ui-CnHfUmDN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-zustand-B4dlGEM2.js">
@@ -80,7 +80,7 @@
     <link rel="modulepreload" crossorigin href="/assets/terminalApi-947l7Ra3.js">
     <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
     <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DCowZ2ab.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-B4eb4ZiU.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-CcIqxMFB.js">
     <link rel="stylesheet" crossorigin href="/assets/src-DasvfkEg.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@openchambery/web",
-  "version": "1.19.7",
+  "version": "1.19.8-beta.1",
   "private": false,
   "type": "module",
   "main": "./server/index.js",

package/server/lib/assistants/DOCUMENTATION.md CHANGED Viewed

@@ -2,7 +2,7 @@
 ## Acceptance criteria
-The in-app Assistant is an OpenChamber-owned **contact**. OpenCode is only the LLM gateway (`POST /api/openchamber/llm/chat/completions`) using already-connected `{providerID, modelID}`. Composer send runs `@earendil-works/pi-agent-core` with `thinkingLevel: 'off'` and OpenChamber API tools only (`new_conversation`, `list_projects`, `list_sessions`, `create_assistant`, `schedule_task`, `message_assistant`, `assign_session`). It does not use `SessionPrompt` / `promptAsync` as the conversation engine, and it never attaches bash/edit/read/write or other OpenCode coding tools.
+The in-app Assistant is an OpenChamber-owned **contact**. OpenCode is only the LLM gateway (`POST /api/openchamber/llm/chat/completions`) using already-connected `{providerID, modelID}`. Composer send runs `@earendil-works/pi-agent-core` with `thinkingLevel: 'off'`. When the assistant has an effective workspace, the harness attaches pi's four coding tools (`read`, `write`, `edit`, `bash`) via `NodeExecutionEnv` in that directory, applies `defaultPrompt`, and merges skills from `~/.claude/skills`, `~/.agents/skills`, plus the project's `.claude/skills` and `.agents/skills` (project wins on name). OpenChamber API tools remain (`new_conversation`, `list_projects`, `list_sessions`, `create_assistant`, `schedule_task`, `message_assistant`, `assign_session`). It does not use `SessionPrompt` / `promptAsync` as the conversation engine. The LLM gateway throwaway session still denies OpenCode tools; file and shell work runs in-process through pi.
 **Session cards (this PR)**
@@ -83,7 +83,7 @@ Snapshots expose the latest 50 `historySessionIDs` in chronological order and `h
 - In-process tests use `whenContactTurnSettled(messageID)` (not part of the HTTP JSON body).
 - Completions: public `POST /llm/chat/completions` still rejects `stream:true`. In-process contact harness passes `onTextDelta` + `globalEventHub` through `boundCompletion` → `createChatCompletion` → throwaway generate for real tokens only.
-Composer messages carry a client message ID. The service accepts the existing OpenCode delivery parts (`{ type: 'text' }` and `{ type: 'file', mime, url, filename? }` data URLs — not a second attachment store), extracts text (`[attachment]` when the send is file-only), admits the user at 202, then runs the contact harness asynchronously (`runContactTurn` / pi-agent-core, thinking off, OpenChamber tools `new_conversation` / `list_projects` / `list_sessions` / `create_assistant` / `schedule_task` / `message_assistant` / `assign_session` only, plus the registered-projects catalog each turn) through the OpenChamber completions gateway (public HTTP non-streaming; in-process `onTextDelta` for contact SSE). Assistant bubbles and tool cards persist at turn end. File parts survive `GET /:id/contact/messages`. The harness forwards those file parts to the completions gateway. Image data URLs reach `promptAsync` only when the connected catalog marks the model as vision-capable; otherwise generate keeps the `[image: …]` description and text-file bytes so a non-vision model cannot stall the contact turn. Gateway 502 responses include `{ error, message }` so the composer can show the OpenCode error string. OpenCode `promptAsync` is not the contact conversation engine; assign uses it only on the **worker** session. Share and queued delivery still use it on Assistant bindings. OpenCode `204` is an admitted empty response. A 404 restores one generation-scoped binding before retrying. Ambiguous network errors preserve the client message ID without another send. Every committed Assistant revision publishes `openchamber:assistants-changed` only after its SQLite transaction completes; clients use the tip to reload the authoritative snapshot after worker-driven stateless binding changes. `POST /:id/session/abort` requires the same `{ sessionID, sessionGeneration }`, returns the binding and `aborted: true`, reports a changed binding as `revision_conflict`, and preserves upstream missing-session `not_found` semantics.
+Composer messages carry a client message ID. The service accepts the existing OpenCode delivery parts (`{ type: 'text' }` and `{ type: 'file', mime, url, filename? }` data URLs — not a second attachment store), extracts text (`[attachment]` when the send is file-only), admits the user at 202, then runs the contact harness asynchronously (`runContactTurn` / pi-agent-core, thinking off, pi `read` / `write` / `edit` / `bash` in the assistant workspace, OpenChamber tools `new_conversation` / `list_projects` / `list_sessions` / `create_assistant` / `schedule_task` / `message_assistant` / `assign_session`, merged `.agents`/`.claude` skills, plus the registered-projects catalog each turn) through the OpenChamber completions gateway (public HTTP non-streaming; in-process `onTextDelta` for contact SSE). Assistant bubbles and tool cards persist at turn end. File parts survive `GET /:id/contact/messages`. The harness forwards those file parts to the completions gateway. Image data URLs reach `promptAsync` only when the connected catalog marks the model as vision-capable; otherwise generate keeps the `[image: …]` description and text-file bytes so a non-vision model cannot stall the contact turn. Gateway 502 responses include `{ error, message }` so the composer can show the OpenCode error string. OpenCode `promptAsync` is not the contact conversation engine; assign uses it only on the **worker** session. Share and queued delivery still use it on Assistant bindings. OpenCode `204` is an admitted empty response. A 404 restores one generation-scoped binding before retrying. Ambiguous network errors preserve the client message ID without another send. Every committed Assistant revision publishes `openchamber:assistants-changed` only after its SQLite transaction completes; clients use the tip to reload the authoritative snapshot after worker-driven stateless binding changes. `POST /:id/session/abort` requires the same `{ sessionID, sessionGeneration }`, returns the binding and `aborted: true`, reports a changed binding as `revision_conflict`, and preserves upstream missing-session `not_found` semantics.
 `GET /api/openchamber/assistants/:assistantID/messages?before=&limit=` returns archived and current bindings as `{ entries: [{ sessionID, directory, info, parts }], nextCursor, complete }`. It reads assistant-owned mirror rows in chronological session and message order, pages toward older rows with an opaque stable cursor, and preserves the raw OpenCode `info` and `part` JSON. `directory` is the effective workspace for that source session and is nullable for legacy archived rows with an unknown workspace. `complete === (nextCursor === null)` marks arrival at the oldest available history. The service reads the latest persisted `limit + 1` rows first, then demand-backfills one page at a time from the newest incomplete archived session covered by the cursor; a request performs at most three upstream pages and reuses persisted pages without upstream access. Backfill page commits are independent. Each `session.messages` page attempt retries only transient 5xx/network-class SDK failures up to three times with short backoff; persistent failures still throw `upstream_error`. An authoritative OpenCode 404 for an archived or old binding marks that session's backfill complete via the `session-missing` reducer path, deletes only its uncovered event mirrors, preserves covered/admitted rows, and continues scanning other incomplete sessions so one deleted session cannot permanently block Assistant history. Successful backfill pages upsert authoritative rows without clearing provisional mirrors missing from that snapshot. Concurrent ensure that replaces a missing current binding archives the old ID and creates a new one; 404 completion never deletes covered history under either identity. A required-page failure surfaces as an upstream error only when the current request's `pageRows()` is empty; when the current range already has covered or provisional rows, the service returns that partial result and keeps the incomplete cursor retryable. Provisional event mirrors stay readable as `covered=0` fallbacks until a shrink-whitelist signal or a later authoritative upsert elevates them. Current-session live sync overrides the matching SQLite message identity in the UI.
@@ -93,4 +93,4 @@ Share operations persist operation identity, Assistant identity, payload hash, p
 Schema v2 migrates legacy Inbox bindings once. It prefers the legacy Inbox session, then the latest successful operation or turn session. Schema v5 makes `workspace_path` nullable and migrates stored managed paths under `dataDir/assistant-workspaces/<assistantID>` to `NULL`. Schema v7 adds `mode` (`continuous` | `stateless`, default `continuous`) and preserves legacy `assistant.mode` during Inbox migration. Schema v10 establishes demand-driven history backfill semantics; existing mirror rows remain partial until a complete backfill state is persisted. New records use `assistant_v2` and carry no legacy topic field. Legacy topic, turn, operation, and assistant tables remain migration sources and compatibility backups. Runtime code never reads or writes them. Migration retains OpenCode sessions and messages.
-Assistant workspaces resolve only under the Assistant workspace root or configured project roots. DTO serialization resolves and creates the managed target through the same containment checks, so project-configured Assistants expose a ready canonical destination for a future managed switch. Managed workspace creation resolves and creates `dataDir/assistant-workspaces/<assistantID>` before a session switch creates its OpenCode session and commits the configuration CAS. Route registration refreshes the authoritative project roots for each request. Each OpenCode session, prompt, message lookup, and skill discovery uses the effective workspace directory, so OpenCode applies its standard workspace skill discovery and configuration. The Assistant system prompt contains only `defaultPrompt` and carries no skill catalog. `skill_roots` is a legacy schema field; migration removes it from `assistant_v2`, and runtime DTOs, input payloads, and writes omit it. `close()` clears the share-retention scheduler and closes SQLite.
+Assistant workspaces resolve only under the Assistant workspace root or configured project roots. DTO serialization resolves and creates the managed target through the same containment checks, so project-configured Assistants expose a ready canonical destination for a future managed switch. Managed workspace creation resolves and creates `dataDir/assistant-workspaces/<assistantID>` before a session switch creates its OpenCode session and commits the configuration CAS. Route registration refreshes the authoritative project roots for each request. Each OpenCode session, prompt, message lookup, and skill discovery uses the effective workspace directory, so OpenCode applies its standard workspace skill discovery and configuration. Contact turns additionally merge `~/.claude/skills`, `~/.agents/skills`, and the workspace `.claude/skills` plus `.agents/skills` into the pi system prompt (project wins on name) and append `defaultPrompt`. `skill_roots` is a legacy schema field; migration removes it from `assistant_v2`, and runtime DTOs, input payloads, and writes omit it. `close()` clears the share-retention scheduler and closes SQLite.

package/server/lib/assistants/contact-tools.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { AssignError, PROJECT_REQUIRED_MESSAGE } from './assign.js';
 import { createAssistantCardPart, createScheduleCardPart, createSessionCardPart } from './cards.js';
+import { isPiCodingToolName } from './pi-tools.js';
 const typeboxString = (description) => {
   const schema = { type: 'string', description };
@@ -34,7 +35,7 @@ export const NEW_CONVERSATION_CONFIRM_BUBBLE = 'Started a new conversation. Prev
 const LIST_SESSIONS_LIMIT_DEFAULT = 20;
 const LIST_SESSIONS_LIMIT_MAX = 50;
-const DENIED_CODING_TOOLS = new Set(['bash', 'edit', 'read', 'write', 'glob', 'grep', 'shell']);
+const DENIED_CODING_TOOLS = new Set(['glob', 'grep', 'shell', 'find', 'ls', 'powershell']);
 const FENCE = new RegExp(`\`\`\`${CONTACT_TOOL_FENCE}\\s*([\\s\\S]*?)\`\`\``, 'u');
 export const MISSED_FENCE_RETRY_USER_TEXT = 'emit the fence now, do not claim success.';
@@ -42,7 +43,7 @@ export const MISSED_TOOL_FAILURE_BUBBLE = 'I could not complete that. No tool ra
 const CREATE_ASSISTANT_INTENT = /建助理|新建[^。\n!]{0,24}助理|创建[^。\n!]{0,24}助理|加一个助理|create (?:an |a new )?assistant|new assistant/iu;
 const SCHEDULE_TASK_INTENT = /排定时任务|排个?定时任务|定时任务|schedule (?:a )?(?:daily )?(?:task|ping)|scheduled task|排个?(?:每日)?(?:任务|ping)/iu;
-const ASSIGN_SESSION_INTENT = /建会话|开会话|开(?:一个)?(?:编码\s*)?(?:session|会话)|open (?:a )?(?:coding )?session|assign_session|write a file|写(?:一个)?文件/giu;
+const ASSIGN_SESSION_INTENT = /建会话|开会话|开(?:一个)?(?:编码\s*)?(?:session|会话)|open (?:a )?(?:coding )?session|assign_session/giu;
 const MESSAGE_ASSISTANT_INTENT = /给[^。\n]{1,40}说(?:一声)?|跟[^。\n]{1,24}说(?:一声)?|告诉(?!我)[^。\n]{1,40}|说一声|message (?:the )?(?:assistant|peer)|(?:tell|message)\s+[A-Za-z0-9._-]+|send (?:a )?message to/iu;
 const NEW_CONVERSATION_INTENT = /开新对话|新对话|清空(?:聊天|对话)|clear chat|new conversation|start over/iu;
 const LIST_PROJECTS_INTENT = /找项目|查项目|看看项目|有哪些项目|项目列表|list projects|find project|registered project|which project/iu;
@@ -387,7 +388,9 @@ export function resolvePeerAssistant(params = {}, assistants = [], currentAssist
 }
 export function formatContactToolsPrompt(tools) {
-  const list = Array.isArray(tools) ? tools.filter((tool) => tool?.name && !DENIED_CODING_TOOLS.has(tool.name)) : [];
+  const list = Array.isArray(tools)
+    ? tools.filter((tool) => tool?.name && !DENIED_CODING_TOOLS.has(tool.name) && !isPiCodingToolName(tool.name))
+    : [];
   if (list.length === 0) return '';
   return [
     'The user talks in natural language (including Chinese). Never ask them to type slash commands.',
@@ -395,7 +398,7 @@ export function formatContactToolsPrompt(tools) {
     'When they want to find a registered project (找项目 / list projects / "openchamber yee"), call list_projects or use the Registered projects block already in context.',
     'When they want existing conversations in a project (现有对话 / list sessions), call list_sessions.',
     'When they want another assistant (建助理 / create an assistant), call create_assistant.',
-    'When they want coding work or a Chat session (建会话 / open a session / write a file / 开个新会话), call assign_session after matching the project.',
+    'When they want a separate Chat coding session (建会话 / open a session / 开个新会话), call assign_session after matching the project. File and shell work in this assistant\'s working directory uses read, write, edit, and bash — not assign_session.',
     'When they want a scheduled task (排定时任务 / schedule daily ping), call schedule_task.',
     'When they want to tell another assistant (给 PeerQA 说一声 / message PeerQA), call message_assistant.',
     `Call exactly one tool per reply by emitting one fenced JSON block:`,

package/server/lib/assistants/contact-tools.test.js CHANGED Viewed

@@ -90,6 +90,8 @@ describe('contact tool protocol', () => {
     ]);
     expect(detectRequestedContactTools('每天 18:00 排一个 ping 定时任务', tools)).toEqual([SCHEDULE_TASK_TOOL_NAME]);
     expect(detectRequestedContactTools('建会话写一个文件', tools)).toEqual([ASSIGN_SESSION_TOOL_NAME]);
+    expect(detectRequestedContactTools('写一个文件', tools)).toEqual([]);
+    expect(detectRequestedContactTools('pwd', tools)).toEqual([]);
     expect(detectRequestedContactTools('给 PeerQA 说一声 hello-from-assistant 写好了', tools)).toEqual([
       MESSAGE_ASSISTANT_TOOL_NAME,
     ]);
@@ -103,9 +105,16 @@ describe('contact tool protocol', () => {
     expect(detectRequestedContactTools('不要开编码 session', tools)).toEqual([]);
   });
-  it('ignores bash/edit tool fences', () => {
-    const text = '```openchamber-tool\n{"name":"bash","arguments":{"command":"ls"}}\n```';
-    expect(parseContactToolCalls(text, ['bash', ASSIGN_SESSION_TOOL_NAME]).toolCall).toBeNull();
+  it('parses bash fences when the pi coding tools are allowed', () => {
+    const text = '```openchamber-tool\n{"name":"bash","arguments":{"command":"pwd"}}\n```';
+    expect(parseContactToolCalls(text, ['bash', ASSIGN_SESSION_TOOL_NAME]).toolCall).toEqual({
+      name: 'bash',
+      arguments: { command: 'pwd' },
+    });
+    expect(parseContactToolCalls(
+      '```openchamber-tool\n{"name":"glob","arguments":{"pattern":"*"}}\n```',
+      ['glob', 'bash'],
+    ).toolCall).toBeNull();
   });
   it('tells DeepSeek to call tools from natural language, not slash commands', () => {

package/server/lib/assistants/harness.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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',