@geekbeer/minion 4.2.0 → 4.3.3

package/core/lib/bundled-skills.js

@@ -0,0 +1,94 @@
+/**
+ * Bundled skill deployment.
+ *
+ * Skills shipped inside the `@geekbeer/minion` package (`skills/`) must reach the
+ * LLM skill directories (`~/.claude/skills/`, etc.) for the agent to actually use
+ * them. `minion-cli configure` copies them at setup time, but a plain package
+ * update (`update-agent` = `npm install -g @geekbeer/minion@latest && restart`)
+ * refreshes the files under node_modules WITHOUT re-running configure — so without
+ * this, bundled skill fixes never reach a running minion.
+ *
+ * Unlike rules/roles/docs (which the servers re-copy unconditionally on every
+ * startup because they are purely package-owned), skills can be customized per
+ * workspace via `minion-cli skill push` / `fetch`, which writes into the same
+ * skill directories. Overwriting on every restart would clobber those custom
+ * versions. So this sync is **version-gated**: bundled skills are (re)deployed
+ * only when the package version differs from the last recorded sync. An
+ * `update-agent` bumps the version → defaults refresh once; ordinary restarts
+ * leave HQ-fetched customizations intact.
+ */
+
+const fs = require('fs')
+const path = require('path')
+
+/**
+ * (Re)deploy bundled skills into the given target directories when the package
+ * version has changed since the last sync.
+ *
+ * @param {object} opts
+ * @param {string} opts.packageRoot  Absolute path to the package root (contains `skills/`)
+ * @param {string} opts.version      Current package version (used as the gate key)
+ * @param {string[]} opts.targetDirs Skill directories to deploy into (e.g. ~/.claude/skills)
+ * @param {string} opts.markerPath   File path storing the last-synced version
+ * @param {Console} [opts.logger]    Logger (defaults to console)
+ * @returns {{ synced: boolean, skills?: number, dirs?: number, reason?: string }}
+ */
+function syncBundledSkills({ packageRoot, version, targetDirs, markerPath, logger = console }) {
+  const bundledSkillsDir = path.join(packageRoot, 'skills')
+
+  try {
+    if (!fs.existsSync(bundledSkillsDir)) {
+      return { synced: false, reason: 'no_bundled_skills' }
+    }
+    if (!version) {
+      return { synced: false, reason: 'no_version' }
+    }
+    if (!Array.isArray(targetDirs) || targetDirs.length === 0) {
+      return { synced: false, reason: 'no_target_dirs' }
+    }
+
+    // Version gate: skip if we already deployed this exact version.
+    let lastSynced = null
+    try {
+      lastSynced = fs.readFileSync(markerPath, 'utf8').trim()
+    } catch {
+      /* no marker yet → first deploy */
+    }
+    if (lastSynced === version) {
+      return { synced: false, reason: 'up_to_date' }
+    }
+
+    const skillNames = fs.readdirSync(bundledSkillsDir).filter((name) => {
+      try {
+        return fs.statSync(path.join(bundledSkillsDir, name)).isDirectory()
+      } catch {
+        return false
+      }
+    })
+
+    for (const targetDir of targetDirs) {
+      fs.mkdirSync(targetDir, { recursive: true })
+      for (const name of skillNames) {
+        const src = path.join(bundledSkillsDir, name)
+        const dest = path.join(targetDir, name)
+        // Clean replace so files removed from the bundle don't linger.
+        fs.rmSync(dest, { recursive: true, force: true })
+        fs.cpSync(src, dest, { recursive: true })
+      }
+    }
+
+    fs.mkdirSync(path.dirname(markerPath), { recursive: true })
+    fs.writeFileSync(markerPath, version)
+
+    logger.log(
+      `[Skills] Re-deployed ${skillNames.length} bundled skill(s) to ${targetDirs.length} dir(s) for v${version}` +
+        (lastSynced ? ` (was v${lastSynced})` : ' (first deploy)'),
+    )
+    return { synced: true, skills: skillNames.length, dirs: targetDirs.length }
+  } catch (err) {
+    logger.error(`[Skills] Failed to sync bundled skills: ${err.message}`)
+    return { synced: false, reason: 'error' }
+  }
+}
+
+module.exports = { syncBundledSkills }

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

@@ -2358,22 +2358,132 @@ POST レスポンス例:
 | 409 | `version_conflict` (他者の編集と衝突)、`name_conflict`、`order_key_collision` (同時挿入の競合、再送可) |
 | 410 | `deck_in_trash` (デッキがゴミ箱にある) |
 
-### Accounting Receipts 🧪 (HQ, experimental)
+### Accounting (HQ, experimental, v4.3.0〜)
 
 `workspaces.feature_flags.experimental_accounting = true` のワークスペース向け。
-レシート (画像/PDF) の一覧取得・ダウンロード・取引紐付けをBearer認証で行える。
-**典型用途**: 人間が `/accounting/receipts` から大量アップロードした未仕訳レシートを
-ミニオン側で OCR → 仕訳作成 → 紐付け、という記帳ワークフロー。
+**全エンドポイントが accountant ロール必須** — 対象 workspace 内のいずれかのプロジェクトで
+accountant ロールが付与されたミニオンのみアクセスできる (職務分掌の原則)。
+
+不正アクセス時のレスポンス:
+- 403 `{error, code: 'accountant_role_required'}` — ロール無し
+- 403 `{error, code: 'no_projects'}` — workspace にプロジェクトが存在せず検証不能
+- 403 `{error, code: 'feature_disabled'}` — accounting フラグ OFF
+- 401 `{error: 'Missing or invalid Authorization header'}` / `{error: 'Invalid API token'}`
+
+書き込み API は `created_by_minion_id` / `updated_by_minion_id` 列に呼び出し元ミニオン ID を記録する (HQ UI で「ミニオンが書き込み」バッジが表示される)。仕訳の `source` は常に `'ai_generated'` で記録される。
+
+**人間専用操作** (ミニオンから提供しない API):
+
+以下は会計データの根幹に影響するため、ミニオンが自律的に実行することを禁じている。
+ミニオンは [Threads API](#threads-hq) で `@user` メンションして人間に依頼すること。
+
+- 決算期の `close` / `reopen` / 期首残高設定
+- 法人税計算の `finalize` / `journalize` / `reopen`
+- 仕訳・科目・取引先・立替・税計算の `DELETE`
+- 勘定科目の rename / アーカイブ (`PATCH`) — ミニオンは作成 (POST) のみ。編集・アーカイブは人間専用
+- 立替経費の `settle` / `bulk-settle`
+- レシートの `attach` / `detach` (= 仕訳との紐付け)
+
+人間依頼の Threads body 例:
+```json
+{
+  "thread_type": "help",
+  "mentions": ["user"],
+  "title": "法人税計算 FY3 の finalize お願いします",
+  "content": "計算ID xxxx の入力が完了しました。\nHQダッシュボード /accounting/tax-calculations/xxxx でレビュー後、Finalize → Journalize ボタンを押してください。",
+  "context": { "accounting_action": "tax_finalize", "calculation_id": "xxxx" }
+}
+```
+
+#### Books / Periods
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/books` | 帳簿メタ取得 (org_type, currency, accounting_start_date, closed_through 等)。未存在なら自動作成 |
+| GET | `/api/minion/workspaces/:id/accounting/periods` | 決算期一覧 (FY1, FY2, ... と status: open/closed) |
+
+#### Accounts
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/accounts` | 勘定科目一覧。Query: `?type=asset\|liability\|equity\|revenue\|expense`, `?include_archived=true\|false` (default false) |
+| POST | `/api/minion/workspaces/:id/accounting/accounts` | 勘定科目追加。Body: `{ code?, name, type, is_wallet?, sort_order? }` |
+
+#### Counterparties (取引先マスタ)
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/counterparties` | 取引先一覧。Query: `?kind=vendor\|customer\|director\|employee\|other`, `?include_archived=true\|false` |
+| GET | `/api/minion/workspaces/:id/accounting/counterparties/:counterpartyId` | 取引先詳細 + 残高 (`{counterparty, balance: {debit_total, credit_total, net}}`) |
+| POST | `/api/minion/workspaces/:id/accounting/counterparties` | 取引先追加。Body: `{ name, kind, member_id?, default_payable_account_id? }` |
+| PATCH | `/api/minion/workspaces/:id/accounting/counterparties/:counterpartyId` | 取引先更新。Body: `{ name?, kind?, member_id?, default_payable_account_id?, is_archived? }` |
+
+#### Journal Entries (仕訳)
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/entries` | 仕訳一覧。Query: `?from=YYYY-MM-DD&to=YYYY-MM-DD&entry_type=income,expense,...&limit=100&offset=0` |
+| GET | `/api/minion/workspaces/:id/accounting/entries/:entryId` | 仕訳詳細 (lines 込み) |
+| POST | `/api/minion/workspaces/:id/accounting/entries` | 仕訳作成。`source='ai_generated'` で記録。期締め後の日付は 409 `code: 'period_closed'` |
+| PATCH | `/api/minion/workspaces/:id/accounting/entries/:entryId` | 仕訳更新。**`source='ai_generated'` の仕訳のみ更新可** (人間作成仕訳は 409 `code: 'human_owned_entry'`) |
+
+仕訳 Body の形式は `SimpleEntryInput` (income/expense/transfer) と `ManualEntryInput` (manual) があり、後者は明細を直接指定する。詳細は `src/lib/accounting/entry-builder.ts` を参照。
+
+#### Receipts (レシート添付)
 
 | Method | Endpoint | 説明 |
 |--------|----------|-------------|
 | GET | `/api/minion/workspaces/:id/accounting/receipts` | レシート一覧。Query: `?attached=true\|false\|all` (default `false`), `?limit=100` (max 500) |
 | GET | `/api/minion/workspaces/:id/accounting/receipts/:receiptId` | メタデータ |
 | GET | `/api/minion/workspaces/:id/accounting/receipts/:receiptId/download` | 60秒有効な signed URL を返す (`{ url, mime_type, file_name, expires_in_seconds }`) |
-| PATCH | `/api/minion/workspaces/:id/accounting/receipts/:receiptId` | 取引と紐付け / 解除。Body: `{ entry_id: string \| null }`。entry_id 指定時は同じ book に属する取引でないと 400 |
+
+**破壊的変更 (v4.3.0)**: 以前は workspace メンバー全員に開いていたが、accountant ロール必須化。
+attach/detach (`PATCH`) は人間専用化したので、ミニオンが OCR → 仕訳作成した場合は HQ UI から
+ユーザーが添付する運用にする。
 
 レシートのMIME種別は `image/png`, `image/jpeg`, `image/webp`, `image/gif`, `image/heic`, `image/heif`, `application/pdf` のいずれか。
 
-**未実装**: ミニオン向け仕訳作成 API (`POST /api/minion/workspaces/:id/accounting/entries`) は現状未実装。
-OCR後の仕訳作成は、当面ユーザー操作で `/accounting/new` から行うか、HQ管理者向けの Supabase session 経由のみ。
+#### Expense Reimbursements (立替経費)
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/reimbursements` | 立替経費一覧。Query: `?status=settled\|unsettled\|all`, `?counterparty_id=<uuid>`, `?limit=100&offset=0` |
+| POST | `/api/minion/workspaces/:id/accounting/reimbursements` | 立替経費追加。Body: `{ paid_by_counterparty_id, occurred_on, amount, description?, expense_account_id, payable_account_id? }`。仕訳 (借方=expense, 貸方=payable) を自動生成 |
+
+#### Reports (試算表 / B/S / P/L)
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/reports/trial-balance` | 試算表 + B/S + P/L 一括。Query: `?from&to&includeZero=true\|false`。`netAssetBalanceSheet` (正味財産区分付き B/S) は 一般社団法人プロファイルのときのみ含まれる |
+| GET | `/api/minion/workspaces/:id/accounting/reports/income-statement` | P/L のみ (軽量) |
+| GET | `/api/minion/workspaces/:id/accounting/reports/balance-sheet` | B/S のみ (軽量) |
+
+#### Tax Calculations (法人税計算ウィザード)
+
+`org_type=corporation` または `general_incorporated_association` のみ。それ以外は 403 `code: 'org_type_ineligible'`。
+
+| Method | Endpoint | 説明 |
+|--------|----------|-------------|
+| GET | `/api/minion/workspaces/:id/accounting/tax-calculations` | 計算一覧。Query: `?fiscal_period_id=<uuid>&status=draft,finalized,journalized` |
+| GET | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId` | 詳細 `{calculation, adjustments, components}` |
+| POST | `/api/minion/workspaces/:id/accounting/tax-calculations` | 計算新規作成。Body: `{ fiscal_period_id, notes? }`。6 税目を seed する |
+| PATCH | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId` | pretax_income / notes 更新 |
+| GET | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/pretax-income` | P/L から税引前当期純利益を再計算 (法人税科目は除外) |
+| GET | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/ensure-accounts` | 必要4科目 (法人税費用 / 未払 / 仮払 / 未収還付) の存在状況確認 |
+| POST | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/ensure-accounts` | 不足4科目をテンプレから自動追加 |
+| POST | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/adjustments` | 別表四相当の加算/減算追加。Body: `{ adjustment_type: addition\|deduction, category, amount, description?, sort_order? }`。category は `entertainment_excess` / `depreciation_excess` / `executive_salary_excess` / `reserve_addition` / `dividend_excluded` / `tax_refund_excluded` / `custom` |
+| PATCH | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/adjustments/:adjId` | 加算/減算更新 |
+| DELETE | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/adjustments/:adjId` | 加算/減算削除 |
+| PATCH | `/api/minion/workspaces/:id/accounting/tax-calculations/:calcId/components/:compId` | 税目別の税率・中間納付・(均等割のみ) 直接税額を更新。`tax_rate` は % 表記 (例 `23.2`)。`calculated_amount` は `tax_type='inhabitant_per_capita'` のみ受理 |
+
+**status 遷移**: ミニオンが触れるのは `draft` のみ。`finalized` / `journalized` 状態の calc を更新しようとすると 409 `code: 'invalid_status'`。reopen も人間専用。
+
+**典型ワークフロー**:
+1. `GET /periods` で期一覧を取得し、対象期 (status='open') の id を選ぶ
+2. `POST /tax-calculations` で新規作成 (pretax_income は P/L から自動取得)
+3. `POST /tax-calculations/:calcId/ensure-accounts` で必要科目を揃える
+4. 国税庁・自治体サイトで税率調査 → `PATCH /components/:compId` で各税目の `tax_rate` を入力
+5. 各税目の中間納付額がある場合 `PATCH /components/:compId` で `prepaid_amount` を入力
+6. 必要なら `POST /adjustments` で別表四相当の加減算を追加 (調査・税理士相談の上)
+7. `POST /api/threads` で人間に finalize 依頼
 

package/docs/task-guides.md

@@ -152,6 +152,25 @@ minion-cli skill list
 minion-cli skill fetch <name>
 ```
 
+`skill fetch` は **HQ レジストリ** から取得する操作です。HQ に push されていないスキルは
+`Skill not found` になります。
+
+### 4. バンドルスキルの配布 (パッケージ同梱スキル)
+
+`@geekbeer/minion` パッケージには既定スキル (例: `accounting-bookkeeping`) が同梱されています。
+これらは **HQ レジストリとは別系統** で、以下のタイミングで `~/.claude/skills/` (および有効な
+他 LLM のスキルディレクトリ) へ自動配備されます:
+
+- `minion-cli configure` 実行時 (初期セットアップ / HQ接続)
+- **パッケージ更新後のエージェント再起動時** (v4.3.3〜) — `update-agent` で `npm install` した後、
+  サーバー起動時に **パッケージのバージョンが変わっていれば** バンドルスキルを再配備する
+  (`~/.minion/skills-sync-version` で前回配備バージョンを記録)
+
+そのため、バンドルスキルの修正を反映するのに `skill fetch` は不要です。`update-agent` →
+再起動だけで最新版が `~/.claude/skills/` に反映されます。HQ にカスタム版を登録している場合は、
+通常の再起動ではそのカスタム版が保持され (バージョン未変更時は再配備しない)、パッケージ更新時
+のみバンドル既定版で上書きされます。ローカルのスキルは `minion-cli skill list --local` で確認できます。
+
 ---
 
 ## DAG ワークフロー (ノード/エッジ形式)

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 })
@@ -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/linux/server.js

@@ -58,6 +58,10 @@ const { startTerminalProxy, stopTerminalProxy } = require('./terminal-proxy')
 // Config warnings (included in heartbeat)
 const { getConfigWarnings } = require('../core/lib/config-warnings')
 
+// Bundled skill deployment (version-gated, see core/lib/bundled-skills.js)
+const { syncBundledSkills } = require('../core/lib/bundled-skills')
+const { getActiveSkillDirs } = require('../core/llm-plugins/lib/skill-dirs')
+
 // Pull-model daemons (from core/)
 const stepPoller = require('../core/lib/step-poller')
 const dagStepPoller = require('../core/lib/dag-step-poller')
@@ -280,6 +284,25 @@ function syncBundledDocs() {
   }
 }
 
+/**
+ * (Re)deploy bundled skills to the active LLM skill directories when the package
+ * version changed. Lets `update-agent` (npm install + restart) propagate skill
+ * fixes without re-running configure, while preserving HQ-fetched customizations
+ * across ordinary restarts. See core/lib/bundled-skills.js.
+ */
+function syncBundledSkillsOnStartup() {
+  try {
+    syncBundledSkills({
+      packageRoot: PACKAGE_ROOT,
+      version,
+      targetDirs: getActiveSkillDirs(),
+      markerPath: path.join(config.HOME_DIR, '.minion', 'skills-sync-version'),
+    })
+  } catch (err) {
+    console.error(`[Skills] Bundled skill sync skipped: ${err.message}`)
+  }
+}
+
 /**
  * Register all routes (shared + Linux-specific)
  */
@@ -339,6 +362,7 @@ async function start() {
     syncBundledRules()
     syncBundledRoles()
     syncBundledDocs()
+    syncBundledSkillsOnStartup()
     syncPermissions()
     syncTmuxConfig()
 

package/package.json

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

package/roles/accountant.md

@@ -5,22 +5,31 @@
 ## 責務
 
 - **記帳**: 取引(仕訳)をHQの会計帳簿に正確に記録する
-- **立替経費の処理**: 役員・従業員が立て替えた経費を記帳・精算する
+- **立替経費の処理**: 役員・従業員が立て替えた経費を記帳する(精算の実行は人間に依頼)
 - **取引先マスタの整備**: 仕入先・顧客・役員・従業員などの取引先を整備する
 - **補助元帳の照会**: 取引先別の残高・明細を確認し、PMやユーザーへ報告する
+- **勘定科目の追加**: テンプレートに不足している科目を追加する(rename/アーカイブ/削除は人間専用)
+- **財務諸表の照会・報告**: 試算表・B/S・P/L を取得し、PMやユーザーへ報告する
+- **法人税計算の補助**: 税引前利益の確認・税率調査・別表四加減算の入力を行い、finalize/journalize は人間に依頼する
 
 ## 利用するスキル
 
 会計操作の具体手順とAPI仕様は専用スキルにまとまっています。コアルールにはあえて含めていません(トークン圧迫を避けるため)。
 
-- `/accounting-bookkeeping` — 取引記帳・立替経費・精算・補助元帳の標準フロー
+- `/accounting-bookkeeping` — 取引記帳・立替経費・補助元帳・財務諸表照会・法人税計算の標準フロー
   - 詳細仕様は `~/.claude/skills/accounting-bookkeeping/references/` 配下を必要時に参照
 
-スキルが未配布の場合は `minion-cli skill fetch accounting-bookkeeping` で取得してください。
+このスキルは `@geekbeer/minion` パッケージに同梱されており、セットアップ時およびパッケージ更新後の
+エージェント再起動時に `~/.claude/skills/` へ自動配備されます。通常 `skill fetch` は不要です。
+万一ローカルに存在しない場合は `minion-cli skill list --local` で確認し、HQ にカスタム版を登録している
+場合のみ `minion-cli skill fetch accounting-bookkeeping` で取得してください
+(バンドル版は HQ には登録されていないため、未カスタムだと `Skill not found` になります)。
 
 ## 重要な原則
 
+- **高リスク操作は人間に依頼する。** 決算期の close/reopen、法人税計算の finalize/journalize、各リソースの DELETE、勘定科目の rename/アーカイブ、立替経費の精算(settle)はミニオンに提供されていません。必要な場合は `POST /api/threads` で `@user` メンションして HQ UI 操作を依頼すること。
 - **仕訳の確定済み(closed)期は修正しない。** 締め後の仕訳訂正はPMの承認が必要です。
+- **編集できる仕訳は自分(AI)が作成したものだけ。** 人間作成仕訳の PATCH は 409 `human_owned_entry` で弾かれます。訂正が必要なら人間に依頼。
 - **立替経費は取引先(counterparty)を必ず紐付ける。** 「誰の立替か」を後から照会できるようにするため。
 - **default_payable_account_id 未設定の取引先には立替記帳できない。** API が 422 を返します。先に取引先ページで貸方科目を設定してください。
 - **判断に迷ったら勝手に進めない。** 不明な取引・推測の余地がある仕訳は、threadで PM にエスカレーションすること。