@openchambery/web 1.19.7-beta.9 → 1.19.8-beta.1

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/routes.js

@@ -1,17 +1,57 @@
 import { AssistantError, createAssistantsService } from './service.js';
+import { createChatCompletion } from '../llm/completions.js';
+import { ensureLlmTempDirectory } from '../llm/temp-directory.js';
+import { setAssignedSessionSettleHandler } from '../session-goal/runtime.js';
+import { createOpencodeClient } from '@opencode-ai/sdk/v2';
 
-const respond = (res, work, success = 200) => Promise.resolve().then(work).then((body) => res.status(success).json(body)).catch((error) => { const code = error instanceof AssistantError ? error.code : 'internal_error'; const status = code === 'not_found' ? 404 : ['revision_conflict', 'idempotency_conflict'].includes(code) ? 409 : code === 'assistant_disabled' ? 403 : code === 'upstream_error' ? 502 : 400; res.status(status).json({ ok: false, error: code }); });
+const respond = (res, work, success = 200) => Promise.resolve().then(work).then((body) => res.status(success).json(body)).catch((error) => { const code = error instanceof AssistantError ? error.code : error?.code || 'internal_error'; const status = code === 'not_found' ? 404 : ['revision_conflict', 'idempotency_conflict'].includes(code) ? 409 : code === 'assistant_disabled' ? 403 : code === 'no_provider' ? 400 : code === 'upstream_error' ? 502 : 400; res.status(status).json({ ok: false, error: code, message: typeof error?.message === 'string' && error.message.trim() ? error.message : code }); });
 const gone = (_req, res) => res.status(410).json({ ok: false, error: 'assistant_topics_retired' });
 
 export const registerAssistantRoutes = (app, dependencies) => {
-  const service = createAssistantsService({ dbPath: dependencies.dbPath, dataDir: dependencies.openchamberDataDir, buildOpenCodeUrl: dependencies.buildOpenCodeUrl, getOpenCodeAuthHeaders: dependencies.getOpenCodeAuthHeaders, getServerId: dependencies.getServerId, getAllowedRoots: dependencies.getAllowedRoots, globalEventHub: dependencies.globalEventHub, onRevisionTip: dependencies.onRevisionTip });
+  const boundCompletion = (input) => createChatCompletion({
+    ...input,
+    buildOpenCodeUrl: dependencies.buildOpenCodeUrl,
+    getOpenCodeAuthHeaders: dependencies.getOpenCodeAuthHeaders,
+    clientFactory: () => createOpencodeClient({
+      baseUrl: dependencies.buildOpenCodeUrl('/', '').replace(/\/$/, ''),
+      headers: dependencies.getOpenCodeAuthHeaders(),
+    }),
+    ensureTempDirectory: ensureLlmTempDirectory,
+    // Throwaway generate may subscribe for real token deltas (contact harness).
+    globalEventHub: input?.globalEventHub ?? dependencies.globalEventHub,
+  });
+  const service = createAssistantsService({
+    dbPath: dependencies.dbPath,
+    dataDir: dependencies.openchamberDataDir,
+    buildOpenCodeUrl: dependencies.buildOpenCodeUrl,
+    getOpenCodeAuthHeaders: dependencies.getOpenCodeAuthHeaders,
+    getServerId: dependencies.getServerId,
+    getAllowedRoots: dependencies.getAllowedRoots,
+    listProjects: dependencies.listProjects,
+    listScheduledTasks: dependencies.listScheduledTasks,
+    sessionIndexService: dependencies.sessionIndexService,
+    upsertScheduledTask: dependencies.upsertScheduledTask,
+    syncScheduledTaskProject: dependencies.syncScheduledTaskProject,
+    globalEventHub: dependencies.globalEventHub,
+    onRevisionTip: dependencies.onRevisionTip,
+    onContactTurnEvent: dependencies.onContactTurnEvent,
+    onContactTurnComplete: dependencies.onContactTurnComplete,
+    createChatCompletion: boundCompletion,
+  });
+  setAssignedSessionSettleHandler(({ sessionId, status }) => service.reportAssignedSessionSettle(sessionId, status));
   app.use('/api/openchamber/assistants', (req, res, next) => Promise.resolve(dependencies.refreshAllowedRoots?.()).then(next).catch((error) => respond(res, () => { throw error; })));
   app.get('/api/openchamber/assistants/capability', (_req, res) => respond(res, () => service.capability()));
   app.get('/api/openchamber/assistants', (_req, res) => respond(res, () => service.snapshot())); app.get('/api/openchamber/assistants/snapshot', (_req, res) => respond(res, () => service.snapshot())); app.put('/api/openchamber/assistants/settings', (req, res) => respond(res, () => service.setEnabled(req.body)));
   app.post('/api/openchamber/assistants', (req, res) => respond(res, () => service.createAssistant(req.body), 201)); app.patch('/api/openchamber/assistants/:assistantID', (req, res) => respond(res, () => service.updateAssistant(req.params.assistantID, req.body))); app.delete('/api/openchamber/assistants/:assistantID', (req, res) => respond(res, () => service.removeAssistant(req.params.assistantID, req.body?.expectedRevision)));
   app.post('/api/openchamber/assistants/:assistantID/session/ensure', (req, res) => respond(res, () => service.ensure(req.params.assistantID))); app.post('/api/openchamber/assistants/:assistantID/session/new', (req, res) => respond(res, () => service.createNew(req.params.assistantID))); app.post('/api/openchamber/assistants/:assistantID/session/compact', (req, res) => respond(res, () => service.compact(req.params.assistantID, req.body))); app.post('/api/openchamber/assistants/:assistantID/session/abort', (req, res) => respond(res, () => service.abort(req.params.assistantID, req.body)));
   app.get('/api/openchamber/assistants/:assistantID/messages', (req, res) => respond(res, () => service.historicalMessages(req.params.assistantID, req.query)));
-  app.post('/api/openchamber/assistants/:assistantID/messages', (req, res) => respond(res, () => service.send(req.params.assistantID, req.body))); app.post('/api/openchamber/assistants/:assistantID/share', (req, res) => respond(res, () => service.share(req.params.assistantID, req.body), 202)); app.get('/api/openchamber/assistants/share-operations/:operationID', (req, res) => respond(res, () => { const operation = service.shareOperation(req.params.operationID); if (!operation) throw new AssistantError('not_found'); return operation; }));
+  app.get('/api/openchamber/assistants/:assistantID/contact/messages', (req, res) => respond(res, () => service.contactMessages(req.params.assistantID, req.query)));
+  app.post('/api/openchamber/assistants/:assistantID/contact/reset', (req, res) => respond(res, () => service.resetContact(req.params.assistantID)));
+  app.post('/api/openchamber/assistants/:assistantID/contact/cards', (req, res) => respond(res, () => service.appendContactCard(req.params.assistantID, req.body), 201));
+  app.post('/api/openchamber/assistants/:assistantID/contact/dm', (req, res) => respond(res, () => service.deliverPeerMessage(req.params.assistantID, req.body), 201));
+  app.get('/api/openchamber/assistants/:assistantID/scheduled-tasks', (req, res) => respond(res, () => service.listAssistantScheduledTasks(req.params.assistantID)));
+  // Contact send admits the user message at 202; assistant bubbles stream on SSE.
+  app.post('/api/openchamber/assistants/:assistantID/messages', (req, res) => respond(res, () => service.send(req.params.assistantID, req.body), 202)); app.post('/api/openchamber/assistants/:assistantID/share', (req, res) => respond(res, () => service.share(req.params.assistantID, req.body), 202)); app.get('/api/openchamber/assistants/share-operations/:operationID', (req, res) => respond(res, () => { const operation = service.shareOperation(req.params.operationID); if (!operation) throw new AssistantError('not_found'); return operation; }));
   app.use('/api/openchamber/assistants/topics', gone); app.use('/api/openchamber/assistants/:assistantID/topics', gone);
-  return { service, close: () => service.close() };
+  return { service, close: () => { setAssignedSessionSettleHandler(null); service.close(); } };
 };