@mmmbuto/nexuscli 0.9.6 → 0.9.7-001-termux

package/lib/server/tests/services.test.js

@@ -3,6 +3,13 @@
  * Phase 7 - Testing & Deployment
  */
 
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const TEST_HOME = fs.mkdtempSync(path.join(os.tmpdir(), 'nexuscli-home-'));
+process.env.HOME = TEST_HOME;
+
 const WorkspaceManager = require('../services/workspace-manager');
 const CliLoader = require('../services/cli-loader');
 const SummaryGenerator = require('../services/summary-generator');
@@ -15,8 +22,10 @@ describe('WorkspaceManager', () => {
   });
 
   test('should validate workspace path', async () => {
-    // Test with allowed path
-    const validPath = '/var/www/myapp';
+    // Test with allowed path (Termux-first)
+    const baseDir = path.join(process.env.HOME || os.tmpdir(), '.nexuscli-test');
+    fs.mkdirSync(baseDir, { recursive: true });
+    const validPath = fs.mkdtempSync(path.join(baseDir, 'ws-'));
     const result = await manager.validateWorkspace(validPath);
     expect(result).toBe(validPath);
   });
@@ -28,7 +37,8 @@ describe('WorkspaceManager', () => {
   });
 
   test('should detect non-existent workspace', async () => {
-    const nonExistent = '/var/nonexistent-workspace-12345';
+    const baseDir = path.join(process.env.HOME || os.tmpdir(), '.nexuscli-test');
+    const nonExistent = path.join(baseDir, 'nonexistent-workspace-12345');
     await expect(manager.validateWorkspace(nonExistent)).rejects.toThrow('does not exist');
   });
 
@@ -41,7 +51,7 @@ describe('WorkspaceManager', () => {
 
   test('should extract title from messages', () => {
     const messages = [
-      { display: 'Implement user authentication feature' },
+      { role: 'user', display: 'Implement user authentication feature' },
       { display: 'Follow up on previous discussion' }
     ];
     const title = manager.extractTitle(messages);
@@ -62,11 +72,6 @@ describe('CliLoader', () => {
     expect(loader.claudePath).toBe(expectedPath);
   });
 
-  test('should initialize with correct historyPath', () => {
-    const expectedPath = require('path').join(process.env.HOME, '.claude', 'history.jsonl');
-    expect(loader.historyPath).toBe(expectedPath);
-  });
-
   test('should have loadMessagesFromCLI method', () => {
     expect(typeof loader.loadMessagesFromCLI).toBe('function');
   });
@@ -147,7 +152,9 @@ describe('SummaryGenerator', () => {
 describe('Integration - Service Interactions', () => {
   test('WorkspaceManager should use consistent path resolution', async () => {
     const manager = new WorkspaceManager();
-    const testPath = '/var/www/myapp';
+    const baseDir = path.join(process.env.HOME || os.tmpdir(), '.nexuscli-test');
+    fs.mkdirSync(baseDir, { recursive: true });
+    const testPath = fs.mkdtempSync(path.join(baseDir, 'ws-'));
     const validated = await manager.validateWorkspace(testPath);
     expect(validated).toBe(testPath);
   });

package/lib/utils/attachments.js

@@ -0,0 +1,100 @@
+const fs = require('fs');
+const path = require('path');
+const { fixTermuxPath } = require('./workspace');
+
+const ATTACHMENT_LINE_REGEX = /^\s*\[Attached:\s*(.+?)\s*\]\s*$/;
+const IMAGE_EXTS = new Set([
+  '.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.tiff', '.tif', '.svg', '.heic'
+]);
+
+function parseAttachmentMarkers(message = '') {
+  if (!message) {
+    return { cleanMessage: message, paths: [] };
+  }
+
+  const lines = message.split('\n');
+  const paths = [];
+  const kept = [];
+
+  for (const line of lines) {
+    const match = line.match(ATTACHMENT_LINE_REGEX);
+    if (match) {
+      paths.push(match[1]);
+      continue;
+    }
+    kept.push(line);
+  }
+
+  const cleanMessage = kept.join('\n').trim();
+  return { cleanMessage, paths };
+}
+
+function isImageAttachment(attachment) {
+  const mimeType = attachment?.mimeType || '';
+  if (mimeType.startsWith('image/')) return true;
+  const ext = path.extname(attachment?.path || '').toLowerCase();
+  return IMAGE_EXTS.has(ext);
+}
+
+function normalizeAttachmentPath(rawPath, workspacePath) {
+  if (!rawPath || typeof rawPath !== 'string') return null;
+  let fixedPath = fixTermuxPath(rawPath);
+  if (!path.isAbsolute(fixedPath) && workspacePath) {
+    fixedPath = path.resolve(workspacePath, fixedPath);
+  }
+  return fixedPath;
+}
+
+function normalizeAttachments({ message, rawMessage, attachments, workspacePath }) {
+  const parsed = parseAttachmentMarkers(message || '');
+  const promptMessage = rawMessage != null ? rawMessage : (parsed.cleanMessage || message || '');
+
+  const incoming = [];
+  if (Array.isArray(attachments)) {
+    incoming.push(...attachments);
+  }
+  if (parsed.paths.length > 0) {
+    parsed.paths.forEach((p) => incoming.push({ path: p }));
+  }
+
+  const seen = new Set();
+  const normalized = [];
+
+  for (const entry of incoming) {
+    if (!entry) continue;
+    const rawPath = typeof entry === 'string' ? entry : entry.path;
+    const resolvedPath = normalizeAttachmentPath(rawPath, workspacePath);
+    if (!resolvedPath) continue;
+    if (!fs.existsSync(resolvedPath)) continue;
+    if (seen.has(resolvedPath)) continue;
+
+    seen.add(resolvedPath);
+    const record = {
+      ...entry,
+      path: resolvedPath,
+      name: entry.name || path.basename(resolvedPath)
+    };
+    normalized.push(record);
+  }
+
+  const attachmentPaths = normalized.map((att) => att.path);
+  const includeDirectories = Array.from(
+    new Set(attachmentPaths.map((p) => path.dirname(p)))
+  );
+  const imageFiles = normalized.filter(isImageAttachment).map((att) => att.path);
+
+  return {
+    promptMessage,
+    attachments: normalized,
+    attachmentPaths,
+    includeDirectories,
+    imageFiles,
+    cleanMessage: parsed.cleanMessage
+  };
+}
+
+module.exports = {
+  normalizeAttachments,
+  parseAttachmentMarkers,
+  isImageAttachment
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mmmbuto/nexuscli",
-  "version": "0.9.6",
-  "description": "NexusCLI - TRI CLI Control Plane (Claude/Codex/Gemini)",
+  "version": "0.9.7-001-termux",
+  "description": "NexusCLI - TRI CLI Control Plane (Claude/Codex/Gemini/Qwen)",
   "main": "lib/server/server.js",
   "bin": {
     "nexuscli": "bin/nexuscli.js"