@1mancompany/onemancompany 0.7.77 → 0.7.80

package/frontend/app.js

@@ -2265,12 +2265,14 @@ class AppController {
     this._inputHistoryIdx = this._inputHistory.length;
     const doSend = async () => {
       const text = (input?.value || '').trim();
-      if (!text) return;
+      const hasPendingFiles = (this._ceoPendingFiles || []).length > 0;
+      if (!text && !hasPendingFiles) return;
 
       // Show typing indicator while waiting for agent response
       this._showCeoTyping();
 
-      // Execute slash command if input starts with /command
+      // Execute slash command if input starts with /command (slash actions
+      // pick up pending files via _attachPendingFilesToFormData when needed).
       if (text.startsWith('/')) {
         const cmdText = text.split(' ')[0].toLowerCase();
         const argText = text.slice(cmdText.length).trim();
@@ -2284,8 +2286,8 @@ class AppController {
         }
       }
 
-      // Save to input history
-      if (!this._inputHistory.length || this._inputHistory[this._inputHistory.length - 1] !== text) {
+      // Save to input history (only when there is actual text)
+      if (text && (!this._inputHistory.length || this._inputHistory[this._inputHistory.length - 1] !== text)) {
         this._inputHistory.push(text);
         if (this._inputHistory.length > 100) this._inputHistory.shift();
         localStorage.setItem('ceo-input-history', JSON.stringify(this._inputHistory));
@@ -2293,8 +2295,20 @@ class AppController {
       this._inputHistoryIdx = this._inputHistory.length;
       input.value = '';
 
+      // Snapshot pending files for this send (display chip + dispatch)
+      const pendingFiles = this._ceoPendingFiles || [];
+      const fileNames = pendingFiles.map(f => f.name);
+
       // Show CEO message immediately in terminal
-      this._ceoTerm?.appendCeoMessage(text);
+      const displayText = text || '(attachment)';
+      this._ceoTerm?.appendCeoMessage(displayText);
+      if (fileNames.length) {
+        this._ceoTerm?.appendMessage({
+          role: 'system',
+          text: `\u{1F4CE} ${fileNames.join(', ')}`,
+          source: 'upload',
+        });
+      }
 
       // /iter mode: create new iteration on pending project
       if (this._pendingIterProject) {
@@ -2308,6 +2322,7 @@ class AppController {
           formData.append('mode', 'standard');
           const productId = document.getElementById('ceo-product-select')?.value || '';
           if (productId) formData.append('product_id', productId);
+          this._attachPendingFilesToFormData(formData);
           await fetch('/api/ceo/task', { method: 'POST', body: formData });
           await this._refreshCeoProjectList();
           this._ceoTerm?.appendMessage({ role: 'system', text: 'New iteration created.', source: 'system' });
@@ -2316,7 +2331,7 @@ class AppController {
         return;
       }
 
-      // Meeting mode: send via meeting/chat API
+      // Meeting mode: send via meeting/chat API (no attachment support yet)
       if (this._currentConvType === 'meeting') {
         try {
           const res = await fetch('/api/meeting/chat', {
@@ -2346,10 +2361,14 @@ class AppController {
       // 1-on-1 conversation mode: send via conversation API
       if (this._currentConvType === 'oneonone' && this._currentConvId) {
         try {
+          const uploaded = await this._uploadCeoPendingFiles();
           await fetch(`/api/conversation/${this._currentConvId}/message`, {
             method: 'POST',
             headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({ text }),
+            body: JSON.stringify({
+              text: text || '(attachment)',
+              attachments: uploaded.map(a => a.path),
+            }),
           });
         } catch (e) { console.error('Failed to send 1-on-1 message:', e); }
         input?.focus();
@@ -2359,10 +2378,14 @@ class AppController {
       if (this._currentCeoProject === this._EA_CHAT && this._eaChatConvId) {
         // EA Chat: send as conversation message — EA decides whether to create project
         try {
+          const uploaded = await this._uploadCeoPendingFiles();
           await fetch(`/api/conversation/${this._eaChatConvId}/message`, {
             method: 'POST',
             headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({ text }),
+            body: JSON.stringify({
+              text: text || '(attachment)',
+              attachments: uploaded.map(a => a.path),
+            }),
           });
           // EA response arrives via WebSocket conversation_message event
         } catch (e) { console.error('Failed to send EA chat message:', e); }
@@ -2376,15 +2399,21 @@ class AppController {
           formData.append('mode', mode);
           const productId2 = document.getElementById('ceo-product-select')?.value || '';
           if (productId2) formData.append('product_id', productId2);
+          this._attachPendingFilesToFormData(formData);
           await fetch('/api/ceo/task', { method: 'POST', body: formData });
           await this._refreshCeoProjectList();
         } catch (e) { console.error('Failed to submit task:', e); }
       } else {
         try {
+          const projectId = this._currentCeoProject.split('/')[0];
+          const uploaded = await this._uploadCeoPendingFiles(projectId);
           await fetch(`/api/ceo/sessions/${encodeURIComponent(this._currentCeoProject)}/message`, {
             method: 'POST',
             headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({text}),
+            body: JSON.stringify({
+              text: text || '(attachment)',
+              attachments: uploaded.map(a => a.path),
+            }),
           });
           await this._refreshCeoProjectList();
         } catch (e) { console.error('Failed to send:', e); }
@@ -2471,16 +2500,12 @@ class AppController {
       this._handleMentionInput(input);
     });
 
-    // File upload
+    // File upload — files queue locally and dispatch with the next message
+    this._ceoPendingFiles = this._ceoPendingFiles || [];
     const fileInput = document.getElementById('ceo-file-input');
     fileInput?.addEventListener('change', () => {
       if (!fileInput.files?.length) return;
-      const names = Array.from(fileInput.files).map(f => f.name).join(', ');
-      this._ceoTerm?.appendMessage({
-        role: 'system', text: `Attached: ${names}`, source: 'upload',
-      });
-      // Store files for next send
-      this._pendingFiles = Array.from(fileInput.files);
+      this._handleCeoFileSelect(fileInput.files);
       fileInput.value = '';
     });
 
@@ -2574,6 +2599,7 @@ class AppController {
           const formData = new FormData();
           formData.append('task', arg);
           formData.append('mode', 'standard');
+          this._attachPendingFilesToFormData(formData);
           fetch('/api/ceo/task', { method: 'POST', body: formData })
             .then(() => { this._refreshCeoProjectList(); this._ceoTerm?.appendMessage({ role: 'system', text: '✓ Project created', source: 'system' }); })
             .catch(e => { this._ceoTerm?.appendMessage({ role: 'system', text: `✗ Failed: ${e.message}`, source: 'system' }); });
@@ -2595,6 +2621,7 @@ class AppController {
           formData.append('task', arg);
           formData.append('project_id', pid.split('/')[0]);
           formData.append('mode', 'standard');
+          this._attachPendingFilesToFormData(formData);
           fetch('/api/ceo/task', { method: 'POST', body: formData })
             .then(() => { this._refreshCeoProjectList(); this._ceoTerm?.appendMessage({ role: 'system', text: '✓ New iteration created', source: 'system' }); })
             .catch(e => { this._ceoTerm?.appendMessage({ role: 'system', text: `✗ Failed: ${e.message}`, source: 'system' }); });
@@ -2622,6 +2649,7 @@ class AppController {
           const formData = new FormData();
           formData.append('task', arg);
           formData.append('mode', 'simple');
+          this._attachPendingFilesToFormData(formData);
           fetch('/api/ceo/task', { method: 'POST', body: formData })
             .then(() => { this._refreshCeoProjectList(); this._ceoTerm?.appendMessage({ role: 'system', text: '✓ Simple task created', source: 'system' }); })
             .catch(e => { this._ceoTerm?.appendMessage({ role: 'system', text: `✗ Failed: ${e.message}`, source: 'system' }); });
@@ -2668,7 +2696,6 @@ class AppController {
       { cmd: '/discuss', desc: 'Start discussion meeting (open floor)', action: async (arg) => {
         await this._startMeetingInConsole('discussion', arg);
       }},
-      { cmd: '/attach', desc: 'Attach file or image', action: () => document.getElementById('ceo-file-input')?.click() },
       { cmd: '/clear', desc: 'Clear EA chat history', action: async () => {
         if (this._currentCeoProject !== this._EA_CHAT) {
           this._ceoTerm?.appendMessage({ role: 'system', text: '/clear only works in EA chat.', source: 'system' });
@@ -6519,6 +6546,97 @@ class AppController {
     return uploaded;
   }
 
+  // ===== CEO Console File Upload (queued, dispatched with the next message) =====
+  _handleCeoFileSelect(files) {
+    if (!this._ceoPendingFiles) this._ceoPendingFiles = [];
+    for (const file of files) {
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        let type = 'file';
+        if (file.type.startsWith('image/')) type = 'image';
+        else if (file.type.startsWith('video/')) type = 'video';
+        this._ceoPendingFiles.push({
+          name: file.name,
+          type,
+          dataUrl: e.target.result,
+          file,
+        });
+        this._updateCeoPreviewBar();
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+
+  _updateCeoPreviewBar() {
+    const bar = document.getElementById('ceo-preview-bar');
+    if (!bar) return;
+    if (!this._ceoPendingFiles || !this._ceoPendingFiles.length) {
+      bar.classList.add('hidden');
+      bar.innerHTML = '';
+      return;
+    }
+    bar.classList.remove('hidden');
+    bar.innerHTML = '';
+    this._ceoPendingFiles.forEach((f, idx) => {
+      const item = document.createElement('div');
+      item.className = 'chat-preview-item';
+      if (f.type === 'image') {
+        item.innerHTML = `<img class="chat-preview-thumb" src="${f.dataUrl}" alt="${this._escapeHtml(f.name)}" />`;
+      } else if (f.type === 'video') {
+        item.innerHTML = `<div class="chat-preview-file">\u{1F3AC}<br>${this._escapeHtml(f.name.substring(0, 12))}</div>`;
+      } else {
+        item.innerHTML = `<div class="chat-preview-file">\u{1F4C4}<br>${this._escapeHtml(f.name.substring(0, 12))}</div>`;
+      }
+      const removeBtn = document.createElement('button');
+      removeBtn.className = 'chat-preview-remove';
+      removeBtn.textContent = '×';
+      removeBtn.title = `Remove ${f.name}`;
+      removeBtn.onclick = () => {
+        this._ceoPendingFiles.splice(idx, 1);
+        this._updateCeoPreviewBar();
+      };
+      item.appendChild(removeBtn);
+      bar.appendChild(item);
+    });
+  }
+
+  async _uploadCeoPendingFiles(projectId = '') {
+    if (!this._ceoPendingFiles || !this._ceoPendingFiles.length) return [];
+    const uploaded = [];
+    const url = projectId
+      ? `/api/upload?project_id=${encodeURIComponent(projectId)}`
+      : '/api/upload';
+    for (const f of this._ceoPendingFiles) {
+      const formData = new FormData();
+      formData.append('file', f.file, f.name);
+      try {
+        const resp = await fetch(url, { method: 'POST', body: formData });
+        const data = await resp.json();
+        if (data.path) {
+          uploaded.push({
+            path: data.path,
+            filename: data.filename || f.name,
+            content_type: data.content_type || '',
+          });
+        }
+      } catch (err) {
+        console.error('CEO upload failed:', err);
+      }
+    }
+    this._ceoPendingFiles = [];
+    this._updateCeoPreviewBar();
+    return uploaded;
+  }
+
+  _attachPendingFilesToFormData(formData) {
+    if (!this._ceoPendingFiles || !this._ceoPendingFiles.length) return;
+    for (const f of this._ceoPendingFiles) {
+      formData.append('files', f.file, f.name);
+    }
+    this._ceoPendingFiles = [];
+    this._updateCeoPreviewBar();
+  }
+
   // ===== Tool Detail — Dynamic Section Renderer Framework =====
   //
   // Each tool's definition returns a `sections` array from the backend.

package/frontend/index.html

@@ -117,9 +117,13 @@
                   <option value="">No Product</option>
                 </select>
               </div>
+              <div id="ceo-preview-bar" class="chat-preview-bar hidden"></div>
               <div id="ceo-conv-input-row">
+                <label class="chat-attach-btn" id="ceo-attach-btn" title="Attach file or image — sent with your next message">
+                  <input type="file" id="ceo-file-input" multiple hidden />
+                  &#128206;
+                </label>
                 <textarea id="ceo-conv-input" placeholder="$ Type message, / for commands (Enter to send)" rows="1" aria-label="CEO message input"></textarea>
-                <input type="file" id="ceo-file-input" multiple hidden />
               </div>
               <div id="ceo-slash-menu" class="hidden"></div>
             </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1mancompany/onemancompany",
-  "version": "0.7.77",
+  "version": "0.7.80",
   "description": "The AI Operating System for One-Person Companies",
   "bin": {
     "onemancompany": "bin/cli.js"

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "onemancompany"
-version = "0.7.77"
+version = "0.7.80"
 description = "A one-man company simulation with pixel art visualization and LangChain AI agents"
 requires-python = ">=3.12"
 dependencies = [

package/src/onemancompany/api/routes.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import json as _json
 import re
 import shutil
 import uuid as _uuid
@@ -136,6 +137,11 @@ def _save_file_deduped(upload_dir: Path, filename: str, content: bytes) -> Path:
     return dest
 
 
+from onemancompany.core.attachments import (
+    build_attachment_prompt as _build_attachment_prompt,
+)
+
+
 def _get_employee_manager():
     """Lazy import to avoid circular dependency."""
     from onemancompany.core.vessel import employee_manager
@@ -572,10 +578,7 @@ async def ceo_submit_task(
     ctx_id = f"{pid}/{iter_id}" if iter_id else pid
 
     # Build attachment info string for EA
-    attach_info = ""
-    if attachments:
-        lines = [f"- Attachment: {a['filename']} (saved at {a['path']})" for a in attachments]
-        attach_info = "\n\nCEO attached the following files:\n" + "\n".join(lines)
+    attach_info = _build_attachment_prompt(attachments)
 
     loop = get_agent_loop(EA_ID)
     if loop:
@@ -723,6 +726,9 @@ async def task_followup(project_id: str, body: dict) -> dict:
     if work_summary_lines:
         context_parts.append(f"Previous work results:\n" + "\n".join(work_summary_lines) + "\n")
     context_parts.append(f"CEO follow-up instructions: {instructions}\n")
+    attach_info = _build_attachment_prompt(body.get("attachments") or [])
+    if attach_info:
+        context_parts.append(attach_info.lstrip("\n") + "\n")
     context_parts.append(
         f"\nBuild on the existing work — do NOT redo completed subtasks unless the CEO explicitly asks."
         f" Use dispatch_child() if subtasks are needed.\n\n"
@@ -833,10 +839,7 @@ async def oneonone_chat(body: dict) -> dict:
         return {"error": f"Employee '{employee_id}' not found"}
 
     # Build attachment info string for prompt injection
-    attach_info = ""
-    if attachments:
-        lines = [f"- Attachment: {a.get('filename', 'file')} (saved at {a.get('path', '')})" for a in attachments]
-        attach_info = "\n\nCEO attached the following files:\n" + "\n".join(lines)
+    attach_info = _build_attachment_prompt(attachments)
 
     # On first message (empty history), mark employee as in meeting
     if not history and emp_data:
@@ -908,7 +911,7 @@ async def oneonone_chat(body: dict) -> dict:
                 messages.append(HumanMessage(content=entry["content"]))
             elif entry.get("role") == "employee":
                 messages.append(AIMessage(content=entry["content"]))
-        messages.append(HumanMessage(content=message))
+        messages.append(HumanMessage(content=message + attach_info))
 
         llm = make_llm(employee_id)
         result = await _llm_invoke_with_retry(llm, messages, category="oneonone", employee_id=employee_id)
@@ -6364,13 +6367,17 @@ async def send_ceo_session_message(project_id: str, body: dict):
 
     # Persist CEO message (masked for credential requests)
     display_text = result.get("display_text", text)
-    await service.send_message(conv.id, "ceo", "CEO", display_text, mentions=mentions)
+    await service.send_message(
+        conv.id, "ceo", "CEO", display_text,
+        mentions=mentions, attachments=body.get("attachments") or [],
+    )
 
     if result["type"] == "followup":
         # Dispatch as a CEO_FOLLOWUP via the existing task_followup logic.
         try:
             followup_result = await task_followup(
-                project_id, {"instructions": text}
+                project_id,
+                {"instructions": text, "attachments": body.get("attachments") or []},
             )
             result["followup"] = followup_result
             result["message"] = "Follow-up instruction dispatched"

package/src/onemancompany/core/attachments.py

@@ -0,0 +1,53 @@
+"""Shared helpers for rendering attachment instructions into LLM prompts.
+
+The CEO submits attachments through multiple paths (task creation, 1-on-1
+chat, EA / project conversations). All of them need to tell the agent to
+read each attached file before responding. The renderer is centralized
+here so prompt wording and quoting rules stay consistent.
+"""
+
+from __future__ import annotations
+
+import json as _json
+from pathlib import Path
+
+
+def build_attachment_prompt(attachments: list[dict]) -> str:
+    """Describe attachments with both display and read-safe path formats.
+
+    The plain path in ``(saved at ...)`` is for human readability. The
+    ``read("...")`` argument and attachment display name use JSON quoting so
+    backslashes, quotes, and newlines stay safe/parsable without inventing
+    custom escaping rules.
+    """
+    if not attachments:
+        return ""
+
+    lines: list[str] = []
+    for attachment in attachments:
+        raw_filename = attachment.get("filename", "file")
+        quoted_filename = _json.dumps("file" if raw_filename is None else str(raw_filename))
+        raw_path = attachment.get("path", "")
+        path = "" if raw_path is None else str(raw_path).strip()
+        if path:
+            lines.append(f"- Attachment: {quoted_filename} (saved at {path}) [read({_json.dumps(path)})]")
+        else:
+            lines.append(f"- Attachment: {quoted_filename}")
+
+    return (
+        "\n\nCEO attached the following files:\n"
+        + "\n".join(lines)
+        + "\nRead each attachment with read() before responding so you can inspect the actual file contents."
+    )
+
+
+def build_attachment_prompt_from_paths(paths: list[str]) -> str:
+    """Same as :func:`build_attachment_prompt`, but accepts bare path strings.
+
+    Used by the conversation flow where ``Message.attachments`` stores just
+    saved-file paths. The display filename is derived from the basename.
+    """
+    if not paths:
+        return ""
+    attachments = [{"filename": Path(p).name, "path": p} for p in paths if p]
+    return build_attachment_prompt(attachments)

package/src/onemancompany/core/conversation_adapters.py

@@ -151,6 +151,9 @@ def _build_conversation_prompt(
             lines.append(f"[{msg.role}]: {msg.text}")
 
     lines.append(f"\n[{new_message.role}]: {new_message.text}")
+    if new_message.attachments:
+        from onemancompany.core.attachments import build_attachment_prompt_from_paths
+        lines.append(build_attachment_prompt_from_paths(list(new_message.attachments)))
     lines.append("\nPlease respond:")
     return "\n".join(lines)
 

package/src/onemancompany/onboard.py

@@ -741,7 +741,7 @@ def _step_execute(
 
     # 6. Generate MCP configs for founding employees
     with console.status("  Generating MCP configs..."):
-        _generate_mcp_configs(extras.get(ENV_KEY_SKILLSMP, ""))
+        _generate_mcp_configs(extras.get(ENV_KEY_SKILLSMP, ""), host, port)
     console.print("  [green]\u2714[/green] MCP configs generated for founding employees")
 
     # 7. Apply agent family (hosting) assignments to founding employees
@@ -830,13 +830,15 @@ def _assign_default_avatars(console: Console) -> None:
         console.print("  [green]\u2714[/green] Founding employees already have avatars")
 
 
-def _generate_mcp_configs(skillsmp_key: str) -> None:
+def _generate_mcp_configs(skillsmp_key: str, host: str, port: int) -> None:
     """Generate mcp_config.json for founding employees."""
     import sys
 
     python_path = sys.executable
     from onemancompany.core.config import EXEC_IDS
     exec_ids = sorted(EXEC_IDS)
+    server_host = "localhost" if host == "0.0.0.0" else host
+    server_url = f"http://{server_host}:{port}"
 
     for emp_id in exec_ids:
         emp_dir = EMPLOYEES_DIR / emp_id
@@ -852,7 +854,7 @@ def _generate_mcp_configs(skillsmp_key: str) -> None:
                     ENV_OMC_TASK_ID: "",
                     ENV_OMC_PROJECT_ID: "",
                     ENV_OMC_PROJECT_DIR: "",
-                    ENV_OMC_SERVER_URL: "http://localhost:8000",
+                    ENV_OMC_SERVER_URL: server_url,
                 },
             },
         }