@mmmbuto/nexuscli 0.9.7-termux → 0.9.7001-termux

package/lib/server/routes/qwen.js

@@ -11,6 +11,7 @@ const { v4: uuidv4 } = require('uuid');
 const sessionManager = require('../services/session-manager');
 const contextBridge = require('../services/context-bridge');
 const { resolveWorkspacePath } = require('../../utils/workspace');
+const { normalizeAttachments } = require('../../utils/attachments');
 
 const router = express.Router();
 const qwenWrapper = new QwenWrapper();
@@ -44,7 +45,7 @@ router.post('/', async (req, res) => {
     console.log('[Qwen] === NEW QWEN REQUEST ===');
     console.log('[Qwen] Body:', JSON.stringify(req.body, null, 2));
 
-    const { conversationId, message, model = 'coder-model', workspace } = req.body;
+    const { conversationId, message, model = 'coder-model', workspace, attachments } = req.body;
 
     if (!message) {
       return res.status(400).json({ error: 'message required' });
@@ -63,6 +64,13 @@ router.post('/', async (req, res) => {
       console.warn(`[Qwen] Workspace corrected: ${workspace} → ${workspacePath}`);
     }
 
+    const attachmentInfo = normalizeAttachments({
+      message,
+      attachments,
+      workspacePath
+    });
+    const userMessage = attachmentInfo.promptMessage || message;
+
     const frontendConversationId = conversationId || uuidv4();
     ensureConversation(frontendConversationId, workspacePath);
 
@@ -91,7 +99,7 @@ router.post('/', async (req, res) => {
     const lastEngine = Message.getLastEngine(frontendConversationId);
     const isEngineBridge = lastEngine && lastEngine !== 'qwen';
 
-    let promptToSend = message;
+    let promptToSend = userMessage;
 
     if (isEngineBridge) {
       const contextResult = await contextBridge.buildContext({
@@ -99,7 +107,7 @@ router.post('/', async (req, res) => {
         sessionId,
         fromEngine: lastEngine,
         toEngine: 'qwen',
-        userMessage: message
+        userMessage: userMessage
       });
       promptToSend = contextResult.prompt;
 
@@ -113,6 +121,15 @@ router.post('/', async (req, res) => {
       console.log(`[Qwen] Native resume: qwen --resume ${nativeSessionId}`);
     }
 
+    const attachmentRefs = attachmentInfo.attachmentPaths.map((filePath) => {
+      const escapedPath = filePath.replace(/([\\\s,;!?()[\]{}])/g, '\\$1');
+      return `@${escapedPath}`;
+    });
+    if (attachmentRefs.length > 0) {
+      promptToSend = `${attachmentRefs.join('\n')}\n\n${promptToSend}`;
+      console.log(`[Qwen] Attached ${attachmentRefs.length} file(s) to prompt`);
+    }
+
     // Save user message
     try {
       Message.create(
@@ -138,6 +155,7 @@ router.post('/', async (req, res) => {
       threadId: nativeSessionId,
       model,
       workspacePath,
+      includeDirectories: attachmentInfo.includeDirectories,
       processId: sessionId,
       onStatus: (event) => {
         res.write(`data: ${JSON.stringify(event)}\n\n`);

package/lib/server/services/qwen-wrapper.js

@@ -83,6 +83,7 @@ class QwenWrapper extends BaseCliWrapper {
     threadId,
     model = DEFAULT_MODEL,
     workspacePath,
+    includeDirectories = [],
     onStatus,
     processId: processIdOverride
   }) {
@@ -99,6 +100,14 @@ class QwenWrapper extends BaseCliWrapper {
         '--include-partial-messages',
       ];
 
+      if (includeDirectories && includeDirectories.length > 0) {
+        includeDirectories.forEach((dir) => {
+          if (dir) {
+            args.push('--include-directories', dir);
+          }
+        });
+      }
+
       if (threadId) {
         args.push('--resume', threadId);
       }
@@ -109,6 +118,9 @@ class QwenWrapper extends BaseCliWrapper {
       console.log(`[QwenWrapper] ThreadId: ${threadId || '(new session)'}`);
       console.log(`[QwenWrapper] CWD: ${cwd}`);
       console.log(`[QwenWrapper] Prompt length: ${prompt.length}`);
+      if (includeDirectories && includeDirectories.length > 0) {
+        console.log(`[QwenWrapper] Include dirs: ${includeDirectories.join(', ')}`);
+      }
 
       let ptyProcess;
       try {

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,6 +1,6 @@
 {
   "name": "@mmmbuto/nexuscli",
-  "version": "0.9.7-termux",
+  "version": "0.9.7001-termux",
   "description": "NexusCLI - TRI CLI Control Plane (Claude/Codex/Gemini/Qwen)",
   "main": "lib/server/server.js",
   "bin": {