@geekbeer/minion 4.1.3 → 4.2.1

package/core/stores/chat-store.js

@@ -133,6 +133,7 @@ function save(session) {
  * Add a message to a session.
  * Creates a new session if none exists for the given session_id.
  * Past sessions are preserved (not deleted).
+ * Wrapped in a transaction so partial saves can't happen on failure.
  * @param {string} sessionId - Claude CLI session ID
  * @param {{ role: string, content: string }} msg - Message to add
  * @param {number} [turnCount] - Optional turn count to add
@@ -140,40 +141,71 @@ function save(session) {
  */
 function addMessage(sessionId, msg, turnCount, workspaceId) {
   const db = getDb()
-  const existing = db.prepare('SELECT * FROM chat_sessions WHERE session_id = ?').get(sessionId)
+  const tx = db.transaction(() => {
+    const existing = db.prepare('SELECT session_id FROM chat_sessions WHERE session_id = ?').get(sessionId)
+
+    if (!existing) {
+      const now = Date.now()
+      db.prepare(
+        'INSERT INTO chat_sessions (session_id, workspace_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?, ?)'
+      ).run(sessionId, workspaceId || null, 0, now, now)
+    }
 
-  // If session doesn't exist, create a new one (past sessions remain in DB)
-  if (!existing) {
-    const now = Date.now()
     db.prepare(
-      'INSERT INTO chat_sessions (session_id, workspace_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?, ?)'
-    ).run(sessionId, workspaceId || null, 0, now, now)
-  }
+      'INSERT INTO chat_messages (session_id, role, content, timestamp) VALUES (?, ?, ?, ?)'
+    ).run(sessionId, msg.role, msg.content, Date.now())
 
-  // Insert message
-  db.prepare(
-    'INSERT INTO chat_messages (session_id, role, content, timestamp) VALUES (?, ?, ?, ?)'
-  ).run(sessionId, msg.role, msg.content, Date.now())
-
-  // Update session metadata
-  const newTurnCount = (turnCount && turnCount > 0) ? turnCount : 0
-  db.prepare(`
-    UPDATE chat_sessions
-    SET updated_at = ?,
-        turn_count = turn_count + ?
-    WHERE session_id = ?
-  `).run(Date.now(), newTurnCount, sessionId)
-
-  // Prune old messages for this session (keep only MAX_MESSAGES most recent)
-  const count = db.prepare('SELECT COUNT(*) as cnt FROM chat_messages WHERE session_id = ?').get(sessionId).cnt
-  if (count > MAX_MESSAGES) {
+    const newTurnCount = (turnCount && turnCount > 0) ? turnCount : 0
     db.prepare(`
-      DELETE FROM chat_messages WHERE id IN (
-        SELECT id FROM chat_messages WHERE session_id = ?
-        ORDER BY id ASC LIMIT ?
-      )
-    `).run(sessionId, count - MAX_MESSAGES)
-  }
+      UPDATE chat_sessions
+      SET updated_at = ?,
+          turn_count = turn_count + ?
+      WHERE session_id = ?
+    `).run(Date.now(), newTurnCount, sessionId)
+
+    const count = db.prepare('SELECT COUNT(*) as cnt FROM chat_messages WHERE session_id = ?').get(sessionId).cnt
+    if (count > MAX_MESSAGES) {
+      db.prepare(`
+        DELETE FROM chat_messages WHERE id IN (
+          SELECT id FROM chat_messages WHERE session_id = ?
+          ORDER BY id ASC LIMIT ?
+        )
+      `).run(sessionId, count - MAX_MESSAGES)
+    }
+  })
+  tx()
+}
+
+/**
+ * Rename a session's ID, carrying over all messages.
+ * Used when a pending session ID (generated locally before the LLM call) is
+ * replaced by the real session_id returned by Claude CLI.
+ * If `newSessionId` already exists, messages from `oldSessionId` are merged
+ * into it and the old session row is dropped.
+ * @param {string} oldSessionId
+ * @param {string} newSessionId
+ * @returns {boolean} true if any rows were touched
+ */
+function rekeySession(oldSessionId, newSessionId) {
+  if (!oldSessionId || !newSessionId || oldSessionId === newSessionId) return false
+  const db = getDb()
+  const tx = db.transaction(() => {
+    const oldSession = db.prepare('SELECT * FROM chat_sessions WHERE session_id = ?').get(oldSessionId)
+    if (!oldSession) return false
+
+    const existingNew = db.prepare('SELECT session_id FROM chat_sessions WHERE session_id = ?').get(newSessionId)
+    if (existingNew) {
+      db.prepare('UPDATE chat_messages SET session_id = ? WHERE session_id = ?').run(newSessionId, oldSessionId)
+      db.prepare('UPDATE chat_sessions SET updated_at = ?, turn_count = turn_count + ? WHERE session_id = ?')
+        .run(Date.now(), oldSession.turn_count || 0, newSessionId)
+      db.prepare('DELETE FROM chat_sessions WHERE session_id = ?').run(oldSessionId)
+    } else {
+      db.prepare('UPDATE chat_sessions SET session_id = ? WHERE session_id = ?').run(newSessionId, oldSessionId)
+      db.prepare('UPDATE chat_messages SET session_id = ? WHERE session_id = ?').run(newSessionId, oldSessionId)
+    }
+    return true
+  })
+  return tx() === true
 }
 
 /**
@@ -208,4 +240,4 @@ function deleteSession(sessionId) {
   return result.changes > 0
 }
 
-module.exports = { load, loadById, listSessions, save, addMessage, clear, deleteSession }
+module.exports = { load, loadById, listSessions, save, addMessage, rekeySession, clear, deleteSession }

package/docs/api-reference.md

@@ -809,20 +809,22 @@ Base path: All endpoints are prefixed with `/api/minion` by the agent's API clie
 |--------|----------|-------------|
 | GET | `/api/minion/me/projects` | 参加プロジェクト一覧（role 含む） |
 
+Query parameters:
+- `workspace_id` (optional, UUID): 指定したワークスペースに属するプロジェクトのみ返す。省略すると参加している全プロジェクト（複数ワークスペース横断）を返す。
+
 Response:
 ```json
-[
-  {
-    "id": "uuid",
-    "name": "project-name",
-    "description": "...",
-    "github_owner": "org",
-    "github_repo": "repo",
-    "role": "pm",
-    "created_at": "...",
-    "updated_at": "..."
-  }
-]
+{
+  "projects": [
+    {
+      "id": "uuid",
+      "name": "project-name",
+      "description": "...",
+      "workspace_id": "uuid",
+      "role": "pm"
+    }
+  ]
+}
 ```
 
 `role` is one of `"pm"` (project manager), `"engineer"`, or `"accountant"`.
@@ -2107,56 +2109,74 @@ DAGスキルノードの `skill_version_id` は **オプション** です。
 ローカルエージェントの `/api/project-memories` は上記 HQ API へのプロキシ。
 詳細なリクエスト/レスポンス仕様はローカル API セクションの「Project Memories」を参照。
 
-### Notes (HQ, プロジェクトノート)
+### Notes (HQ, ワークスペース／プロジェクトノート)
+
+ノートはワークスペース直下に保存され、任意で 1 つ以上のプロジェクトにリンクできる(`note_project_links`)。
+**テキストベースの成果物（レポート、調査結果、要約等）はノートに保存すること。** HQダッシュボードでユーザーが即座に閲覧・編集・検索でき、バージョン管理もされる。
+
+ミニオンには**ワークスペース経由API**と**プロジェクト経由API**の2系統がある:
 
-プロジェクトに紐づくノート。**テキストベースの成果物（レポート、調査結果、要約等）はノートに保存すること。**
-ノートはHQダッシュボードでユーザーが即座に閲覧・編集・検索でき、バージョン管理もされる。
+- **ワークスペース経由** — 自分が所属するワークスペース内のすべてのノートにアクセス可能 (プロジェクト未リンクのノート含む)。一般的な検索・整理に使う
+- **プロジェクト経由** — 作業コンテキストが特定プロジェクトに紐づいているときに、そのプロジェクトのノートだけを絞り込む用途。プロジェクトメンバーシップで認可される
+
+**削除エンドポイントは存在しない**(事故防止のため人間操作限定)。アーカイブが必要な場合は `status=archived` で PATCH すること。
+
+#### Workspace-scoped Notes
 
 | Method | Endpoint | Description |
 |--------|----------|-------------|
-| GET | `/api/minion/projects/:projectId/notes` | プロジェクトのノート一覧。Query: `?status=active&include_content=true` |
-| POST | `/api/minion/projects/:projectId/notes` | ノートを作成しプロジェクトにリンク |
-| GET | `/api/minion/projects/:projectId/notes/:noteId` | ノート詳細（全文含む） |
-| PATCH | `/api/minion/projects/:projectId/notes/:noteId` | ノートを更新（内容変更時にバージョン自動作成） |
-| GET | `/api/minion/projects/:projectId/notes/search?q=keyword` | ノートを全文検索 |
+| GET | `/api/minion/workspaces/:id/notes` | ワークスペースのノート一覧。Query: `?status=active&search=&project_id=&include_content=true` |
+| POST | `/api/minion/workspaces/:id/notes` | ノート作成。Body: `{title, content?, project_ids?: string[]}`。`project_ids` 指定時は自動でリンク |
+| GET | `/api/minion/workspaces/:id/notes/:noteId` | ノート詳細(全文) |
+| PATCH | `/api/minion/workspaces/:id/notes/:noteId` | 更新(内容変更時にバージョン自動作成)。Body: `{title?, content?, status?, change_summary?}` |
+| GET | `/api/minion/workspaces/:id/notes/search?q=keyword` | ワークスペース全体を全文検索 |
 
-POST `/api/minion/projects/:projectId/notes` body:
+POST `/api/minion/workspaces/:id/notes` body:
 ```json
 {
   "title": "調査レポート: ユーザー行動分析",
-  "content": "## 概要\n..."
+  "content": "## 概要\n...",
+  "project_ids": ["<uuid>"]
 }
 ```
 
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
-| `title` | string | Yes | ノートのタイトル |
-| `content` | string | No | ノートの本文（Markdown） |
+| `title` | string | Yes | ワークスペース内で一意である必要がある |
+| `content` | string | No | Markdown本文 |
+| `project_ids` | string[] | No | リンクするプロジェクト(ワークスペースに属している必要あり) |
 
-PATCH `/api/minion/projects/:projectId/notes/:noteId` body:
-```json
-{
-  "title": "更新されたタイトル",
-  "content": "更新された本文",
-  "change_summary": "データを追加"
-}
-```
+#### Project-scoped Notes
 
-| Field | Type | Required | Description |
-|-------|------|----------|-------------|
-| `title` | string | No | 新しいタイトル |
-| `content` | string | No | 新しい本文 |
-| `change_summary` | string | No | 変更の要約（バージョン履歴に記録） |
+特定プロジェクトのノートだけを絞り込みたいときに使う。認可は `project_members` を経由。
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| GET | `/api/minion/projects/:projectId/notes` | プロジェクトのノート一覧。Query: `?status=active&include_content=true` |
+| POST | `/api/minion/projects/:projectId/notes` | ノート作成 + 当該プロジェクトに自動リンク |
+| GET | `/api/minion/projects/:projectId/notes/:noteId` | ノート詳細(全文含む) |
+| PATCH | `/api/minion/projects/:projectId/notes/:noteId` | ノートを更新(内容変更時にバージョン自動作成) |
+| GET | `/api/minion/projects/:projectId/notes/search?q=keyword` | プロジェクト内のノートを全文検索 |
+
+PATCH body は workspace 版と共通: `{title?, content?, change_summary?}` (status は workspace 経由のみ受理)。
 
 #### hq CLI ラッパー
 
 ```bash
+# プロジェクトスコープ
 hq note create <project_id> --title "タイトル" --content "本文"
 hq note create <project_id> --title "タイトル" --file /tmp/report.md
 hq note update <project_id> <note_id> --content "更新内容" --change-summary "修正理由"
 hq note list <project_id>
 hq note get <project_id> <note_id>
 hq note search <project_id> "キーワード"
+
+# ワークスペーススコープ (プロジェクト紐づけなしも対象)
+hq note create --workspace <workspace_id> --title "タイトル" --content "本文"
+hq note update --workspace <workspace_id> <note_id> --content "更新内容"
+hq note list --workspace <workspace_id>
+hq note get --workspace <workspace_id> <note_id>
+hq note search --workspace <workspace_id> "キーワード"
 ```
 
 ### Meeting Rooms 🧪 (HQ, experimental, v3.59.0〜)

package/linux/bin/hq

@@ -19,12 +19,17 @@
 #   hq list workspaces                    - List workspaces this minion belongs to
 #   hq list dag-workflows [project_id]    - List DAG workflows (optionally filter by project)
 #   hq note create <project_id> --title "Title" --content "Body" [--file path]
-#                                         - Create a note linked to the project
+#   hq note create --workspace <workspace_id> --title "Title" --content "Body" [--file path] [--project-ids <id,id>]
+#                                         - Create a note (project- or workspace-scoped)
 #   hq note update <project_id> <note_id> --content "Body" [--title "Title"] [--file path] [--change-summary "summary"]
+#   hq note update --workspace <workspace_id> <note_id> --content "Body" [--title "Title"] [--status active|archived]
 #                                         - Update an existing note
 #   hq note list <project_id>             - List notes in the project
+#   hq note list --workspace <workspace_id>  - List notes in the workspace (incl. project-unlinked)
 #   hq note get <project_id> <note_id>    - Get a single note with full content
+#   hq note get --workspace <workspace_id> <note_id>  - Same, workspace-scoped
 #   hq note search <project_id> <query>   - Search notes in the project
+#   hq note search --workspace <workspace_id> <query> - Search across the whole workspace
 #   hq create dag-workflow <body.json>    - Create a DAG workflow (PM only). Body: {project_id, name, graph?, ...}
 #   hq put dag-workflow <id> <body.json>  - Update DAG workflow draft (PM only). Body: {graph?, content?, ...}
 #   hq publish dag-workflow <id>          - Publish the draft as a new version (PM only, validated)
@@ -163,10 +168,15 @@ print_usage() {
   echo "  hq list workspaces                    - List workspaces this minion belongs to" >&2
   echo "  hq list dag-workflows [project_id]    - List DAG workflows (optionally by project)" >&2
   echo "  hq note create <project_id> --title \"Title\" --content \"Body\" [--file path]" >&2
+  echo "  hq note create --workspace <ws_id> --title \"Title\" --content \"Body\" [--project-ids <id,id>]" >&2
   echo "  hq note update <project_id> <note_id> --content \"Body\" [--title \"Title\"] [--file path]" >&2
-  echo "  hq note list <project_id>             - List notes in the project" >&2
-  echo "  hq note get <project_id> <note_id>    - Get a single note" >&2
-  echo "  hq note search <project_id> <query>   - Search notes in the project" >&2
+  echo "  hq note update --workspace <ws_id> <note_id> --content \"Body\" [--title \"Title\"] [--status active|archived]" >&2
+  echo "  hq note list <project_id>                 - List notes in the project" >&2
+  echo "  hq note list --workspace <ws_id>          - List notes in the workspace" >&2
+  echo "  hq note get <project_id> <note_id>        - Get a single note" >&2
+  echo "  hq note get --workspace <ws_id> <note_id> - Get a single note (workspace-scoped)" >&2
+  echo "  hq note search <project_id> <query>       - Search notes in the project" >&2
+  echo "  hq note search --workspace <ws_id> <query> - Search notes across the workspace" >&2
   echo "  hq create dag-workflow <body.json>    - Create a DAG workflow (PM only)" >&2
   echo "  hq put dag-workflow <id> <body.json>  - Update DAG workflow draft (PM only)" >&2
   echo "  hq publish dag-workflow <id>          - Publish the draft as a new version (PM only)" >&2
@@ -310,22 +320,38 @@ case "${1:-}" in
 
   note)
     action="${2:-}"
+    shift 2 || true
+    # Resolve scope: either "--workspace <ws_id>" (must be first) or positional <project_id>.
+    note_base=""
+    if [ "${1:-}" = "--workspace" ]; then
+      ws_id="${2:-}"
+      if [ -z "$ws_id" ]; then
+        echo "Error: --workspace requires a workspace_id" >&2
+        exit 1
+      fi
+      note_base="$BASE_URL/workspaces/$ws_id/notes"
+      shift 2
+    else
+      project_id="${1:-}"
+      if [ -z "$project_id" ] || [ "${project_id#--}" != "$project_id" ]; then
+        echo "Usage: hq note $action <project_id> ... | hq note $action --workspace <ws_id> ..." >&2
+        exit 1
+      fi
+      note_base="$BASE_URL/projects/$project_id/notes"
+      shift
+    fi
     case "$action" in
       create)
-        project_id="${3:-}"
-        if [ -z "$project_id" ]; then
-          echo "Usage: hq note create <project_id> --title \"Title\" --content \"Body\" [--file path]" >&2
-          exit 1
-        fi
-        shift 3
         note_title=""
         note_content=""
         note_file=""
+        project_ids_csv=""
         while [ $# -gt 0 ]; do
           case "$1" in
             --title) note_title="$2"; shift 2 ;;
             --content) note_content="$2"; shift 2 ;;
             --file) note_file="$2"; shift 2 ;;
+            --project-ids) project_ids_csv="$2"; shift 2 ;;
             *) echo "Unknown option: $1" >&2; exit 1 ;;
           esac
         done
@@ -344,38 +370,47 @@ case "${1:-}" in
           echo "Error: --content or --file is required" >&2
           exit 1
         fi
-        # Build JSON body using jq or python3
         if command -v jq &>/dev/null; then
           body=$(jq -n --arg t "$note_title" --arg c "$note_content" '{title: $t, content: $c}')
+          if [ -n "$project_ids_csv" ]; then
+            body=$(echo "$body" | jq --arg ids "$project_ids_csv" '. + {project_ids: ($ids | split(","))}')
+          fi
         elif command -v python3 &>/dev/null; then
-          body=$(python3 -c "import json,sys; print(json.dumps({'title': sys.argv[1], 'content': sys.argv[2]}))" "$note_title" "$note_content")
+          body=$(python3 -c "
+import json, sys
+d = {'title': sys.argv[1], 'content': sys.argv[2]}
+if sys.argv[3]:
+    d['project_ids'] = [s for s in sys.argv[3].split(',') if s]
+print(json.dumps(d))
+" "$note_title" "$note_content" "$project_ids_csv")
         else
           echo "Error: jq or python3 is required to build JSON" >&2
           exit 1
         fi
         tmpfile=$(mktemp)
         echo "$body" > "$tmpfile"
-        send_json_request POST "$BASE_URL/projects/$project_id/notes" "$tmpfile"
+        send_json_request POST "$note_base" "$tmpfile"
         rm -f "$tmpfile"
         ;;
       update)
-        project_id="${3:-}"
-        note_id="${4:-}"
-        if [ -z "$project_id" ] || [ -z "$note_id" ]; then
-          echo "Usage: hq note update <project_id> <note_id> --content \"Body\" [--title \"Title\"] [--file path] [--change-summary \"summary\"]" >&2
+        note_id="${1:-}"
+        if [ -z "$note_id" ]; then
+          echo "Error: <note_id> is required" >&2
           exit 1
         fi
-        shift 4
+        shift
         note_title=""
         note_content=""
         note_file=""
         change_summary=""
+        note_status=""
         while [ $# -gt 0 ]; do
           case "$1" in
             --title) note_title="$2"; shift 2 ;;
             --content) note_content="$2"; shift 2 ;;
             --file) note_file="$2"; shift 2 ;;
             --change-summary) change_summary="$2"; shift 2 ;;
+            --status) note_status="$2"; shift 2 ;;
             *) echo "Unknown option: $1" >&2; exit 1 ;;
           esac
         done
@@ -386,16 +421,16 @@ case "${1:-}" in
           fi
           note_content=$(cat "$note_file")
         fi
-        if [ -z "$note_content" ] && [ -z "$note_title" ]; then
-          echo "Error: at least --content, --file, or --title is required" >&2
+        if [ -z "$note_content" ] && [ -z "$note_title" ] && [ -z "$note_status" ]; then
+          echo "Error: at least --content, --file, --title, or --status is required" >&2
           exit 1
         fi
-        # Build JSON body
         if command -v jq &>/dev/null; then
           body="{}"
           [ -n "$note_title" ] && body=$(echo "$body" | jq --arg t "$note_title" '. + {title: $t}')
           [ -n "$note_content" ] && body=$(echo "$body" | jq --arg c "$note_content" '. + {content: $c}')
           [ -n "$change_summary" ] && body=$(echo "$body" | jq --arg s "$change_summary" '. + {change_summary: $s}')
+          [ -n "$note_status" ] && body=$(echo "$body" | jq --arg st "$note_status" '. + {status: $st}')
         elif command -v python3 &>/dev/null; then
           body=$(python3 -c "
 import json, sys
@@ -403,20 +438,20 @@ d = {}
 if sys.argv[1]: d['title'] = sys.argv[1]
 if sys.argv[2]: d['content'] = sys.argv[2]
 if sys.argv[3]: d['change_summary'] = sys.argv[3]
+if sys.argv[4]: d['status'] = sys.argv[4]
 print(json.dumps(d))
-" "$note_title" "$note_content" "$change_summary")
+" "$note_title" "$note_content" "$change_summary" "$note_status")
         else
           echo "Error: jq or python3 is required to build JSON" >&2
           exit 1
         fi
         tmpfile=$(mktemp)
         echo "$body" > "$tmpfile"
-        # Use PATCH for update
         response=$(curl -s -w "\n%{http_code}" -X PATCH \
           -H "Authorization: Bearer $API_TOKEN" \
           -H "Content-Type: application/json" \
           --data-binary "@$tmpfile" \
-          "$BASE_URL/projects/$project_id/notes/$note_id")
+          "$note_base/$note_id")
         rm -f "$tmpfile"
         http_code=$(echo "$response" | tail -1)
         body_out=$(echo "$response" | sed '$d')
@@ -429,30 +464,22 @@ print(json.dumps(d))
         fi
         ;;
       list)
-        project_id="${3:-}"
-        if [ -z "$project_id" ]; then
-          echo "Usage: hq note list <project_id>" >&2
-          exit 1
-        fi
-        fetch_resource "$BASE_URL/projects/$project_id/notes?include_content=false"
+        fetch_resource "$note_base?include_content=false"
         ;;
       get)
-        project_id="${3:-}"
-        note_id="${4:-}"
-        if [ -z "$project_id" ] || [ -z "$note_id" ]; then
-          echo "Usage: hq note get <project_id> <note_id>" >&2
+        note_id="${1:-}"
+        if [ -z "$note_id" ]; then
+          echo "Error: <note_id> is required" >&2
           exit 1
         fi
-        fetch_resource "$BASE_URL/projects/$project_id/notes/$note_id"
+        fetch_resource "$note_base/$note_id"
         ;;
       search)
-        project_id="${3:-}"
-        query="${4:-}"
-        if [ -z "$project_id" ] || [ -z "$query" ]; then
-          echo "Usage: hq note search <project_id> <query>" >&2
+        query="${1:-}"
+        if [ -z "$query" ]; then
+          echo "Error: <query> is required" >&2
           exit 1
         fi
-        # URL-encode the query
         if command -v jq &>/dev/null; then
           encoded=$(printf '%s' "$query" | jq -sRr @uri)
         elif command -v python3 &>/dev/null; then
@@ -460,7 +487,7 @@ print(json.dumps(d))
         else
           encoded="$query"
         fi
-        fetch_resource "$BASE_URL/projects/$project_id/notes/search?q=$encoded"
+        fetch_resource "$note_base/search?q=$encoded"
         ;;
       *)
         echo "Unknown note action: $action" >&2

package/linux/routes/chat.js

@@ -17,6 +17,7 @@
  */
 
 const { spawn } = require('child_process')
+const crypto = require('crypto')
 const fs = require('fs')
 const path = require('path')
 const { verifyToken } = require('../../core/lib/auth')
@@ -57,10 +58,16 @@ async function chatRoutes(fastify) {
     // so the user's chat log keeps just the [task:UUID] tag, not a noisy dump.
     const prompt = await buildContextPrefix(message, context, session_id, workspaceId, referenced_tasks)
 
-    // Store user message
+    // Persist the user message BEFORE invoking the LLM so that crashes,
+    // timeouts, or unparseable CLI output can't lose it. For new sessions we
+    // mint a local pending ID; it gets rekeyed to the real Claude CLI session
+    // ID once that comes back on the SSE stream.
     const currentSessionId = session_id || null
-    if (currentSessionId) {
-      await chatStore.addMessage(currentSessionId, { role: 'user', content: message }, undefined, workspaceId)
+    const pendingSessionId = currentSessionId || `pending-${crypto.randomUUID()}`
+    try {
+      await chatStore.addMessage(pendingSessionId, { role: 'user', content: message }, undefined, workspaceId)
+    } catch (err) {
+      console.error('[Chat] failed to persist user message:', err.message)
     }
 
     // Take over response handling from Fastify for SSE streaming
@@ -74,7 +81,7 @@ async function chatRoutes(fastify) {
     reply.raw.flushHeaders()
 
     try {
-      await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message)
+      await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message, pendingSessionId)
     } catch (err) {
       console.error('[Chat] stream error:', err.message)
       const errorEvent = JSON.stringify({ type: 'error', error: err.message })
@@ -391,7 +398,7 @@ async function buildContextPrefix(message, context, sessionId, workspaceId, refe
       '[ファイル出力ルール]',
       '成果物の保存先は以下のルールに従うこと。`/home/minion/` 直下にファイルを保存しないこと。',
       '',
-      '- **テキスト成果物**（レポート、調査結果、要約等）→ ノートに保存: `hq note create <project_id> --title "タイトル" --content "本文"`',
+      '- **テキスト成果物**（レポート、調査結果、要約等）→ ノートに保存: `hq note create <project_id> --title "タイトル" --content "本文"` (プロジェクト紐づけなしは `hq note create --workspace <ws_id> ...`)',
       '- **バイナリファイル**（PDF、画像、ZIP等）→ `~/files/` に配置（ユーザーがHQからダウンロード可能）',
       '- **一時ファイル** → `/tmp/` に配置（作業後に削除）',
       '',
@@ -541,16 +548,16 @@ function getLlmBinary() {
  * Tracks block types to correctly forward tool_use vs text events
  * and counts turns for session management.
  */
-async function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
+async function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   // Plugin system path: Primary is set → delegate to plugin
   const primary = getActivePrimary()
   if (primary) {
-    return streamViaPlugin(primary, res, prompt, sessionId, workspaceId, originalMessage)
+    return streamViaPlugin(primary, res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId)
   }
-  return streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage)
+  return streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId)
 }
 
-async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, originalMessage) {
+async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   const input = { prompt }
   const activeRef = { current: null }
   activeChatChild = { kill: () => activeRef.current?.kill?.('SIGTERM') }
@@ -576,6 +583,7 @@ async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, orig
 
   res.on('close', () => { activeRef.current?.kill?.('SIGTERM') })
 
+  let pluginError = null
   try {
     let output
     if (plugin.capabilities.streaming && typeof plugin.stream === 'function') {
@@ -592,25 +600,42 @@ async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, orig
       }
     }
     resolvedSessionId = output?.metadata?.sessionId || resolvedSessionId
+  } catch (err) {
+    // Swallow here so we can persist any partial response first; rethrow below.
+    pluginError = err
   } finally {
     activeChatChild = null
   }
 
-  if (resolvedSessionId) {
-    if (!sessionId) {
-      await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
+  // For new sessions, the user message was persisted under pendingSessionId
+  // before the plugin call. Rekey it to the real session ID now that we
+  // know it. If the plugin never reported a session ID, leave the message
+  // under the pending key so the history isn't lost.
+  const persistSessionId = resolvedSessionId || pendingSessionId
+  try {
+    if (!sessionId && resolvedSessionId && pendingSessionId && pendingSessionId !== resolvedSessionId) {
+      chatStore.rekeySession(pendingSessionId, resolvedSessionId)
     }
-    if (fullResponse) {
-      await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
+    if (fullResponse && persistSessionId) {
+      await chatStore.addMessage(persistSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
     }
+  } catch (err) {
+    console.error('[Chat] failed to persist assistant message:', err.message)
   }
 
-  const session = await chatStore.load(workspaceId)
-  const totalTurnCount = session?.turn_count || turnCount
+  if (pluginError) throw pluginError
+
+  let totalTurnCount = turnCount
+  try {
+    const session = await chatStore.load(workspaceId)
+    totalTurnCount = session?.turn_count || turnCount
+  } catch (err) {
+    console.error('[Chat] failed to load session for done event:', err.message)
+  }
   res.write(`data: ${JSON.stringify({ type: 'done', session_id: resolvedSessionId, turn_count: totalTurnCount })}\n\n`)
 }
 
-function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage) {
+function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {
@@ -786,16 +811,21 @@ function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, original
         console.log(`[Chat] final stderr (tail 500): ${stderrBuffer.slice(-500)}`)
       }
 
-      // Store messages in chat-store
-      if (resolvedSessionId) {
-        // If this was a new session, also store the user message now
-        if (!sessionId) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
+      // For new sessions, the user message was already persisted under
+      // pendingSessionId before spawn. Rekey it to the real session ID when
+      // Claude CLI reported one; otherwise leave the message under the
+      // pending key so the history is never lost on crash.
+      const persistSessionId = resolvedSessionId || pendingSessionId
+      try {
+        if (!sessionId && resolvedSessionId && pendingSessionId && pendingSessionId !== resolvedSessionId) {
+          chatStore.rekeySession(pendingSessionId, resolvedSessionId)
         }
-        // Store assistant response with turn count
-        if (fullResponse) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
+        // Persist any partial response we managed to collect, even on error
+        if (fullResponse && persistSessionId) {
+          await chatStore.addMessage(persistSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
         }
+      } catch (err) {
+        console.error('[Chat] failed to persist assistant message:', err.message)
       }
 
       if (code !== 0) {
@@ -811,8 +841,13 @@ function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, original
       }
 
       // Load current turn count from session for the done event
-      const session = await chatStore.load(workspaceId)
-      const totalTurnCount = session?.turn_count || turnCount
+      let totalTurnCount = turnCount
+      try {
+        const session = await chatStore.load(workspaceId)
+        totalTurnCount = session?.turn_count || turnCount
+      } catch (err) {
+        console.error('[Chat] failed to load session for done event:', err.message)
+      }
 
       const doneEvent = JSON.stringify({
         type: 'done',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "4.1.3",
+  "version": "4.2.1",
   "description": "AI Agent runtime for Minion - manages status and skill deployment on VPS",
   "main": "linux/server.js",
   "bin": {

package/rules/core.md

@@ -445,28 +445,32 @@ display_name が同じユーザーが同一ワークスペースに複数いる
 
 ### ノートへの保存 (`hq note` コマンド)
 
-テキストベースの成果物は原則ノートに保存する。ノートはプロジェクトに紐づき、HQダッシュボードで閲覧できる。
+テキストベースの成果物は原則ノートに保存する。ノートはワークスペース直下に保存され、任意で 1 つ以上のプロジェクトにリンクできる。HQダッシュボードで閲覧・編集・検索でき、バージョン管理もされる。
+
+スコープの使い分け:
+
+- **プロジェクトスコープ** — 作業がプロジェクトに紐づくとき (`hq note ... <project_id>`)。プロジェクトのノートタブから即発見できる
+- **ワークスペーススコープ** — プロジェクトに紐づかない一般的なメモや、ワークスペース横断で検索したいとき (`hq note ... --workspace <workspace_id>`)。プロジェクト未指定でも作成・検索できる
 
 ```bash
-# ノートを作成（プロジェクトに紐づけ）
+# プロジェクトスコープ（作業コンテキストが特定プロジェクト）
 hq note create <project_id> --title "レポートタイトル" --content "本文..."
-
-# 長い内容はファイルから読み込む
 hq note create <project_id> --title "調査結果" --file /tmp/report.md
-
-# 既存ノートを更新
 hq note update <project_id> <note_id> --content "更新された内容"
-
-# ノート一覧を確認
 hq note list <project_id>
-
-# ノート内容を取得
 hq note get <project_id> <note_id>
-
-# ノートを検索
 hq note search <project_id> "キーワード"
+
+# ワークスペーススコープ（プロジェクト未紐づけのノート含む）
+hq note create --workspace <workspace_id> --title "メモ" --content "..."
+hq note update --workspace <workspace_id> <note_id> --content "更新内容"
+hq note list --workspace <workspace_id>
+hq note get --workspace <workspace_id> <note_id>
+hq note search --workspace <workspace_id> "キーワード"
 ```
 
+**削除はミニオンから実行できない**(事故防止のため人間操作限定)。不要なノートは `hq note update ... --status archived` (または PATCH の `status: "archived"`) でアーカイブすること。
+
 ### ノート内のユーザーメンション
 
 人間ユーザーがノート編集UIで `Ctrl+I` を押すと、自分の発言を示すアバター付きチップが行頭に挿入される。マークダウン上は次の形式で永続化される:

package/win/routes/chat.js

@@ -13,6 +13,7 @@
  */
 
 const { spawn } = require('child_process')
+const crypto = require('crypto')
 const fs = require('fs')
 const path = require('path')
 const http = require('http')
@@ -130,8 +131,19 @@ async function chatRoutes(fastify) {
     const prompt = await buildContextPrefix(message, context, session_id, workspaceId, referenced_tasks)
     const currentSessionId = session_id || null
 
-    if (currentSessionId) {
-      await chatStore.addMessage(currentSessionId, { role: 'user', content: message }, undefined, workspaceId)
+    // Persist the user message BEFORE invoking the LLM so that crashes,
+    // timeouts, or unparseable CLI output can't lose it. New sessions get a
+    // local pending ID; it gets rekeyed to the real Claude CLI session ID
+    // once that comes back on the SSE stream.
+    // In WSL mode the upstream WSL session server keeps its own store, so we
+    // only persist locally for existing sessions (matching prior behavior).
+    const pendingSessionId = currentSessionId || `pending-${crypto.randomUUID()}`
+    if (!wsl_mode || currentSessionId) {
+      try {
+        await chatStore.addMessage(pendingSessionId, { role: 'user', content: message }, undefined, workspaceId)
+      } catch (err) {
+        console.error('[Chat] failed to persist user message:', err.message)
+      }
     }
 
     reply.hijack()
@@ -149,7 +161,7 @@ async function chatRoutes(fastify) {
         await proxyWslChat(reply.raw, prompt, currentSessionId)
         wslModeActive = false
       } else {
-        await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message)
+        await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message, pendingSessionId)
       }
     } catch (err) {
       wslModeActive = false
@@ -452,7 +464,7 @@ async function buildContextPrefix(message, context, sessionId, workspaceId, refe
       '[ファイル出力ルール]',
       '成果物の保存先は以下のルールに従うこと。`/home/minion/` 直下にファイルを保存しないこと。',
       '',
-      '- **テキスト成果物**（レポート、調査結果、要約等）→ ノートに保存: `hq note create <project_id> --title "タイトル" --content "本文"`',
+      '- **テキスト成果物**（レポート、調査結果、要約等）→ ノートに保存: `hq note create <project_id> --title "タイトル" --content "本文"` (プロジェクト紐づけなしは `hq note create --workspace <ws_id> ...`)',
       '- **バイナリファイル**（PDF、画像、ZIP等）→ `~/files/` に配置（ユーザーがHQからダウンロード可能）',
       '- **一時ファイル** → `/tmp/` に配置（作業後に削除）',
       '',
@@ -594,15 +606,15 @@ function getLlmBinary() {
  * Tracks block types to correctly forward tool_use vs text events
  * and counts turns for session management.
  */
-async function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
+async function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   const primary = getActivePrimary()
   if (primary) {
-    return streamViaPlugin(primary, res, prompt, sessionId, workspaceId, originalMessage)
+    return streamViaPlugin(primary, res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId)
   }
-  return streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage)
+  return streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId)
 }
 
-async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, originalMessage) {
+async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   const input = { prompt }
   const activeRef = { current: null }
 
@@ -627,37 +639,57 @@ async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, orig
 
   res.on('close', () => { activeRef.current?.kill?.('SIGTERM') })
 
-  let output
-  if (plugin.capabilities.streaming && typeof plugin.stream === 'function') {
-    output = await plugin.stream(input, emit, { resumeSessionId: sessionId, activeChildRef: activeRef })
-  } else {
-    output = await plugin.invoke(input)
-    if (output.text) {
-      fullResponse = output.text
-      res.write(`data: ${JSON.stringify({ type: 'text', content: output.text })}\n\n`)
-      turnCount = 1
-    }
-    if (output.error) {
-      res.write(`data: ${JSON.stringify({ type: 'error', error: output.error.message })}\n\n`)
+  let pluginError = null
+  try {
+    let output
+    if (plugin.capabilities.streaming && typeof plugin.stream === 'function') {
+      output = await plugin.stream(input, emit, { resumeSessionId: sessionId, activeChildRef: activeRef })
+    } else {
+      output = await plugin.invoke(input)
+      if (output.text) {
+        fullResponse = output.text
+        res.write(`data: ${JSON.stringify({ type: 'text', content: output.text })}\n\n`)
+        turnCount = 1
+      }
+      if (output.error) {
+        res.write(`data: ${JSON.stringify({ type: 'error', error: output.error.message })}\n\n`)
+      }
     }
+    resolvedSessionId = output?.metadata?.sessionId || resolvedSessionId
+  } catch (err) {
+    // Swallow here so we can persist any partial response first; rethrow below.
+    pluginError = err
   }
-  resolvedSessionId = output?.metadata?.sessionId || resolvedSessionId
 
-  if (resolvedSessionId) {
-    if (!sessionId) {
-      await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
+  // For new sessions, the user message was persisted under pendingSessionId
+  // before the plugin call. Rekey it to the real session ID now that we
+  // know it. If the plugin never reported a session ID, leave the message
+  // under the pending key so the history isn't lost.
+  const persistSessionId = resolvedSessionId || pendingSessionId
+  try {
+    if (!sessionId && resolvedSessionId && pendingSessionId && pendingSessionId !== resolvedSessionId) {
+      chatStore.rekeySession(pendingSessionId, resolvedSessionId)
     }
-    if (fullResponse) {
-      await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
+    if (fullResponse && persistSessionId) {
+      await chatStore.addMessage(persistSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
     }
+  } catch (err) {
+    console.error('[Chat] failed to persist assistant message:', err.message)
   }
 
-  const session = await chatStore.load(workspaceId)
-  const totalTurnCount = session?.turn_count || turnCount
+  if (pluginError) throw pluginError
+
+  let totalTurnCount = turnCount
+  try {
+    const session = await chatStore.load(workspaceId)
+    totalTurnCount = session?.turn_count || turnCount
+  } catch (err) {
+    console.error('[Chat] failed to load session for done event:', err.message)
+  }
   res.write(`data: ${JSON.stringify({ type: 'done', session_id: resolvedSessionId, turn_count: totalTurnCount })}\n\n`)
 }
 
-function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage) {
+function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage, pendingSessionId) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {
@@ -809,14 +841,22 @@ function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, original
         console.log(`[Chat] final stderr (tail 500): ${stderrBuffer.slice(-500)}`)
       }
 
-      if (resolvedSessionId) {
-        if (!sessionId) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
+      // For new sessions, the user message was already persisted under
+      // pendingSessionId before spawn. Rekey it to the real session ID when
+      // Claude CLI reported one; otherwise leave the message under the
+      // pending key so the history is never lost on crash.
+      const persistSessionId = resolvedSessionId || pendingSessionId
+      try {
+        if (!sessionId && resolvedSessionId && pendingSessionId && pendingSessionId !== resolvedSessionId) {
+          chatStore.rekeySession(pendingSessionId, resolvedSessionId)
         }
-        if (fullResponse) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
+        if (fullResponse && persistSessionId) {
+          await chatStore.addMessage(persistSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
         }
+      } catch (err) {
+        console.error('[Chat] failed to persist assistant message:', err.message)
       }
+
       if (code !== 0) {
         const errorMsg = stderrBuffer.trim() || `Claude CLI exited with code ${code}`
         console.error(`[Chat] CLI failed (exit ${code}, partial=${!!fullResponse}): ${errorMsg}`)
@@ -828,8 +868,13 @@ function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, original
         })}\n\n`)
       }
 
-      const session = await chatStore.load(workspaceId)
-      const totalTurnCount = session?.turn_count || turnCount
+      let totalTurnCount = turnCount
+      try {
+        const session = await chatStore.load(workspaceId)
+        totalTurnCount = session?.turn_count || turnCount
+      } catch (err) {
+        console.error('[Chat] failed to load session for done event:', err.message)
+      }
 
       res.write(`data: ${JSON.stringify({ type: 'done', session_id: resolvedSessionId, turn_count: totalTurnCount })}\n\n`)
       resolve()