@openchambery/web 1.19.13-beta.1 → 1.19.13-beta.2

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

@@ -3,6 +3,8 @@ import os from 'node:os'
 import path from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import {
+  CLEAR_CHAT_HISTORY_CONFIRM_BUBBLE,
+  CLEAR_CHAT_HISTORY_TOOL_NAME,
   CREATE_ASSISTANT_TOOL_NAME,
   MESSAGE_ASSISTANT_TOOL_NAME,
   MISSED_FENCE_RETRY_USER_TEXT,
@@ -875,4 +877,126 @@ describe('runContactTurn', () => {
     expect(result.bubbles.join('')).not.toContain('dot.png')
     expect(result.bubbles.join('')).not.toContain('note.txt')
   })
+
+  it('real Agent loop: clear_chat_history fence runs once, terminates, no follow-up completion', async () => {
+    const clearContactMemory = vi.fn(async () => ({ reset: true, memoryCleared: true }))
+    const resetContact = vi.fn(async () => ({ reset: true, historyCleared: true }))
+    const tools = createContactTools({ clearContactMemory, resetContact })
+    let completions = 0
+    const createChatCompletion = vi.fn(async () => {
+      completions += 1
+      if (completions > 4) {
+        throw new Error('harness safety stop: clear_chat_history must terminate without follow-up LLM')
+      }
+      // Looping model would keep emitting wipe fences; terminate must stop after one tool run.
+      return {
+        completion: {
+          choices: [{
+            message: {
+              content: '```openchamber-tool\n{"name":"clear_chat_history","arguments":{}}\n```',
+            },
+          }],
+        },
+      }
+    })
+    const result = await runContactTurn({
+      assistant: { providerID: 'p', modelID: 'm', defaultPrompt: '' },
+      history: [
+        { role: 'user', content: 'secret before wipe' },
+        { role: 'assistant', content: 'remembered secret' },
+      ],
+      userText: '清空聊天记录',
+      tools,
+      createChatCompletion,
+      // Default real Agent — only completion is stubbed (same pattern as assign terminate).
+    })
+    expect(resetContact).toHaveBeenCalledTimes(1)
+    expect(clearContactMemory).not.toHaveBeenCalled()
+    expect(result.reset).toBe(true)
+    expect(result.historyCleared).toBe(true)
+    expect(result.bubbles).toEqual([CLEAR_CHAT_HISTORY_CONFIRM_BUBBLE])
+    expect(result.bubbles.join('')).not.toMatch(/not cleared|denied|new_conversation instead|secret/i)
+    expect(result.cards).toEqual([])
+    expect(createChatCompletion).toHaveBeenCalledTimes(1)
+    expect(completions).toBe(1)
+  })
+
+  it('real Agent loop: clear_chat_history after cross-turn confirm terminates once with confirm only', async () => {
+    const clearContactMemory = vi.fn(async () => ({ reset: true, memoryCleared: true }))
+    const resetContact = vi.fn(async () => ({ reset: true, historyCleared: true }))
+    const tools = createContactTools({ clearContactMemory, resetContact })
+    let completions = 0
+    const createChatCompletion = vi.fn(async () => {
+      completions += 1
+      if (completions > 4) {
+        throw new Error('harness safety stop: wipe must terminate once')
+      }
+      return {
+        completion: {
+          choices: [{
+            message: {
+              content: '```openchamber-tool\n{"name":"clear_chat_history","arguments":{}}\n```',
+            },
+          }],
+        },
+      }
+    })
+    const result = await runContactTurn({
+      assistant: { providerID: 'p', modelID: 'm', defaultPrompt: '' },
+      history: [
+        { role: 'user', content: '能不能帮我清一下聊天？' },
+        { role: 'assistant', content: '是要清空聊天记录吗？' },
+      ],
+      userText: '对，清空聊天记录',
+      tools,
+      createChatCompletion,
+    })
+    expect(resetContact).toHaveBeenCalledTimes(1)
+    expect(clearContactMemory).not.toHaveBeenCalled()
+    expect(result.reset).toBe(true)
+    expect(result.historyCleared).toBe(true)
+    expect(result.bubbles).toEqual([CLEAR_CHAT_HISTORY_CONFIRM_BUBBLE])
+    expect(result.bubbles.join('')).not.toMatch(/not cleared|denied|explicit wipe|new_conversation instead/i)
+    expect(createChatCompletion).toHaveBeenCalledTimes(1)
+    expect(completions).toBe(1)
+  })
+
+  it('real Agent loop: new_conversation terminates once and does not call resetContact', async () => {
+    const clearContactMemory = vi.fn(async () => ({ reset: true, memoryCleared: true }))
+    const resetContact = vi.fn(async () => ({ reset: true, historyCleared: true }))
+    const tools = createContactTools({ clearContactMemory, resetContact })
+    let completions = 0
+    const createChatCompletion = vi.fn(async () => {
+      completions += 1
+      if (completions > 4) {
+        throw new Error('harness safety stop: new_conversation must terminate without follow-up LLM')
+      }
+      return {
+        completion: {
+          choices: [{
+            message: {
+              content: '```openchamber-tool\n{"name":"new_conversation","arguments":{}}\n```',
+            },
+          }],
+        },
+      }
+    })
+    const result = await runContactTurn({
+      assistant: { providerID: 'p', modelID: 'm', defaultPrompt: '' },
+      history: [
+        { role: 'user', content: 'transcript stays' },
+        { role: 'assistant', content: 'yes it does' },
+      ],
+      userText: '清除记忆',
+      tools,
+      createChatCompletion,
+    })
+    expect(clearContactMemory).toHaveBeenCalledTimes(1)
+    expect(resetContact).not.toHaveBeenCalled()
+    expect(result.reset).toBe(true)
+    expect(result.historyCleared).toBe(false)
+    expect(result.bubbles).toEqual([NEW_CONVERSATION_CONFIRM_BUBBLE])
+    expect(createChatCompletion).toHaveBeenCalledTimes(1)
+    expect(completions).toBe(1)
+  })
 })

package/server/lib/assistants/routes.js

@@ -1,10 +1,11 @@
 import { AssistantError, createAssistantsService } from './service.js';
+import { isSafeInlineImageMime } from './contact-attachments.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 : 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 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', 'contact_generation_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) => {
@@ -49,6 +50,50 @@ export const registerAssistantRoutes = (app, dependencies) => {
   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));
+  // Contact attachments: raw-byte PUT + opaque GET (content-addressed under dataDir).
+  app.put('/api/openchamber/assistants/:assistantID/contact/attachments/:uploadID', (req, res) => {
+    const controller = new AbortController();
+    req.once?.('aborted', () => controller.abort());
+    respond(res, () => service.putAssistantContactAttachment(req.params.assistantID, req.params.uploadID, {
+      stream: req,
+      headers: req.headers,
+      signal: controller.signal,
+    }), 201);
+  });
+  app.get('/api/openchamber/assistants/:assistantID/contact/attachments/:attachmentID', (req, res) => {
+    Promise.resolve()
+      .then(() => service.getAssistantContactAttachment(req.params.assistantID, req.params.attachmentID))
+      .then((file) => {
+        res.status(200);
+        res.setHeader('Content-Type', file.mime || 'application/octet-stream');
+        res.setHeader('Content-Length', String(file.size));
+        res.setHeader('ETag', file.etag || `"${file.sha256}"`);
+        res.setHeader('X-Content-Type-Options', 'nosniff');
+        // App owns cache; do not let browsers/CDNs immutable-cache attachment bodies.
+        res.setHeader('Cache-Control', 'private, no-store');
+        const safeInline = isSafeInlineImageMime(file.mime);
+        const name = file.filename ? encodeURIComponent(file.filename) : 'attachment';
+        res.setHeader(
+          'Content-Disposition',
+          `${safeInline ? 'inline' : 'attachment'}; filename*=UTF-8''${name}`,
+        );
+        res.end(file.buffer);
+      })
+      .catch((error) => {
+        const code = error instanceof AssistantError ? error.code : error?.code || 'internal_error';
+        const status = code === 'not_found' ? 404
+          : ['revision_conflict', 'idempotency_conflict', 'contact_generation_conflict'].includes(code) ? 409
+          : code === 'assistant_disabled' ? 403
+          : code === 'PROMPT_ATTACHMENT_TOO_LARGE' ? 413
+          : code === 'upstream_error' ? 502
+          : 400;
+        res.status(status).json({
+          ok: false,
+          error: code,
+          message: typeof error?.message === 'string' && error.message.trim() ? error.message : code,
+        });
+      });
+  });
   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; }));