engine7 7.1.120 → 7.1.121

package/templates/skills/email/scripts/smtp.js

@@ -0,0 +1,238 @@
+#!/usr/bin/env node
+
+/**
+ * SMTP Email CLI — engine7 email skill v2
+ *
+ * v2 改造（设计 docs/superpowers/specs/2026-10-10-installer-email-skill-design.md）：
+ * - 凭证：stateDir config tools.email 优先，.env 回退（email-config.js）
+ * - 发送留底：每次 send 记入 <stateDir>/email-sent.log（jsonl：时间/收件人/主题）
+ *   ——「直接发」也永远有记录（分级闸的追责基础；SMTP 无真撤回）
+ * - 收件人自动入候选名单（email-gate.js candidates；用户确认后升级 verified）
+ * - --json 统一错误分类（同 imap.js）
+ * - 单日发信熔断 dailySendLimit（默认 20，config 可调；防 agent 失控群发）
+ */
+
+const nodemailer = require('nodemailer')
+const path = require('path')
+const fs = require('fs')
+const { resolveEmailConfig, classifyError } = require('./email-config.js')
+const { addCandidate } = require('./email-gate.js')
+
+const DAILY_SEND_LIMIT_DEFAULT = 20
+
+// Parse command-line arguments
+function parseArgs() {
+  const args = process.argv.slice(2)
+  const command = args[0]
+  const options = {}
+  const positional = []
+
+  for (let i = 1; i < args.length; i++) {
+    const arg = args[i]
+    if (arg.startsWith('--')) {
+      const key = arg.slice(2)
+      const value = args[i + 1]
+      options[key] = value || true
+      if (value && !value.startsWith('--')) i++
+    } else {
+      positional.push(arg)
+    }
+  }
+
+  return { command, options, positional }
+}
+
+function stateDirPath() {
+  return process.env.ENGINE_STATE_DIR || process.env.ENGINE7_STATE_DIR || path.join(__dirname, '..', '..', '..')
+}
+
+// Create SMTP transporter（凭证来自 email-config）
+function createTransporter() {
+  const cfg = resolveEmailConfig()
+  if (!cfg) {
+    const err = new Error('缺少邮件配置：先在 stateDir config 配 tools.email，或提供 .env')
+    err.reason = 'config_missing'
+    throw err
+  }
+  const config = {
+    host: cfg.smtp.host,
+    port: cfg.smtp.port,
+    secure: cfg.smtp.secure,
+    auth: { user: cfg.smtp.user, pass: cfg.smtp.pass },
+    tls: { rejectUnauthorized: process.env.SMTP_REJECT_UNAUTHORIZED !== 'false' },
+  }
+  if (!config.host || !config.auth.user || !config.auth.pass) {
+    const err = new Error('SMTP 配置不完整（host/user/pass）')
+    err.reason = 'config_missing'
+    throw err
+  }
+  return nodemailer.createTransport(config)
+}
+
+// 发送留底（jsonl 追加；不记正文——正文可能含隐私，主题+收件人足够追责）
+function appendSentLog(entry) {
+  const p = path.join(stateDirPath(), 'email-sent.log')
+  try {
+    fs.mkdirSync(path.dirname(p), { recursive: true })
+    fs.appendFileSync(p, JSON.stringify({ ts: new Date().toISOString(), ...entry }) + '\n')
+  } catch (err) {
+    console.error('[smtp] 留底失败（不影响发送结果）:', err.message)
+  }
+}
+
+// 单日已发计数（熔断用）
+function todaySentCount() {
+  const p = path.join(stateDirPath(), 'email-sent.log')
+  const today = new Date().toISOString().slice(0, 10)
+  try {
+    return fs.readFileSync(p, 'utf8').split('\n')
+      .filter(Boolean)
+      .filter(line => line.includes(`"ts":"${today}`)).length
+  } catch { return 0 }
+}
+
+function dailyLimit() {
+  const stateDir = stateDirPath()
+  try {
+    const cfg = JSON.parse(fs.readFileSync(path.join(stateDir, 'configs', 'main.json'), 'utf8'))
+    return cfg?.tools?.email?.dailySendLimit || DAILY_SEND_LIMIT_DEFAULT
+  } catch { return DAILY_SEND_LIMIT_DEFAULT }
+}
+
+// Send email
+async function sendEmail(options) {
+  const transporter = createTransporter()
+
+  try {
+    await transporter.verify()
+  } catch (err) {
+    throw new Error(`SMTP connection failed: ${err.message}`)
+  }
+
+  const mailOptions = {
+    from: options.from || process.env.SMTP_FROM || undefined,
+    to: options.to,
+    cc: options.cc || undefined,
+    bcc: options.bcc || undefined,
+    subject: options.subject || '(no subject)',
+    text: options.text || undefined,
+    html: options.html || undefined,
+    attachments: options.attachments || [],
+  }
+
+  if (!mailOptions.text && !mailOptions.html) mailOptions.text = options.body || ''
+
+  const info = await transporter.sendMail(mailOptions)
+
+  // 发送留底 + 收件人自动入候选（agent 侧分级闸的名单数据基础）
+  const recipients = String(options.to).split(',').map(s => s.trim()).filter(Boolean)
+  appendSentLog({ to: options.to, cc: options.cc || '', subject: mailOptions.subject, messageId: info.messageId })
+  for (const r of recipients) {
+    try { addCandidate(r) } catch { /* 名单写失败不阻塞发送 */ }
+  }
+
+  return { success: true, messageId: info.messageId, response: info.response, to: mailOptions.to }
+}
+
+// Read file content for attachments
+function readAttachment(filePath) {
+  if (!fs.existsSync(filePath)) {
+    throw new Error(`Attachment file not found: ${filePath}`)
+  }
+  return { filename: path.basename(filePath), path: path.resolve(filePath) }
+}
+
+// Send email with file content
+async function sendEmailWithContent(options) {
+  if (options.attach) {
+    const attachFiles = options.attach.split(',').map(f => f.trim())
+    options.attachments = attachFiles.map(f => readAttachment(f))
+  }
+  return await sendEmail(options)
+}
+
+// Test SMTP connection
+async function testConnection() {
+  const transporter = createTransporter()
+  const cfg = resolveEmailConfig()
+  try {
+    await transporter.verify()
+    const info = await transporter.sendMail({
+      from: cfg.address, // 发件人必须是授权码账号本身——缺失会让 nodemailer 生成畸形 envelope（QQ 报 502 Invalid parameters，1010 冒烟实测）
+      to: cfg.address, // Send to self
+      subject: 'SMTP Connection Test',
+      text: 'This is a test email from the engine7 email skill.',
+    })
+    appendSentLog({ to: 'self', subject: 'SMTP Connection Test', messageId: info.messageId, test: true })
+    return { success: true, message: 'SMTP connection successful', messageId: info.messageId }
+  } catch (err) {
+    throw new Error(`SMTP test failed: ${err.message}`)
+  }
+}
+
+// Main CLI handler
+async function main() {
+  const { command, options } = parseArgs()
+  const jsonMode = options.json === true
+
+  try {
+    let result
+
+    switch (command) {
+      case 'send': {
+        if (!options.to) throw new Error('Missing required option: --to <email>')
+
+        // 单日熔断
+        if (todaySentCount() >= dailyLimit()) {
+          const err = new Error(`已达单日发信上限 ${dailyLimit()} 封（dailySendLimit），暂停发信`)
+          err.reason = 'daily_limit'
+          throw err
+        }
+
+        if (!options.subject && !options['subject-file']) {
+          throw new Error('Missing required option: --subject <text> or --subject-file <file>')
+        }
+        if (options['subject-file']) {
+          options.subject = fs.readFileSync(options['subject-file'], 'utf8').trim()
+        }
+        if (options['body-file']) {
+          const content = fs.readFileSync(options['body-file'], 'utf8')
+          if (options['body-file'].endsWith('.html') || options.html) options.html = content
+          else options.text = content
+        } else if (options['html-file']) {
+          options.html = fs.readFileSync(options['html-file'], 'utf8')
+        } else if (options.body) {
+          options.text = options.body
+        }
+
+        result = await sendEmailWithContent(options)
+        break
+      }
+
+      case 'test':
+        result = await testConnection()
+        break
+
+      default:
+        console.error('Available commands: send, test')
+        console.error('  send   --to <email> --subject <text> [--body <text>] [--html] [--cc <email>] [--bcc <email>] [--attach <file>] [--json]')
+        console.error('  test   Test SMTP connection [--json]')
+        process.exit(1)
+    }
+
+    if (jsonMode) console.log(JSON.stringify({ ok: true, reason: 'sent', command, result }, null, 2))
+    else console.log(JSON.stringify(result, null, 2))
+  } catch (err) {
+    const reason = err.reason || classifyError(err)
+    if (jsonMode) {
+      console.log(JSON.stringify({ ok: false, reason, command: process.argv[2], error: String(err.message).slice(0, 300) }, null, 2))
+    } else {
+      console.error(`Error [${reason}]:`, err.message)
+    }
+    process.exit(1)
+  }
+}
+
+if (require.main === module) main()
+
+module.exports = { parseArgs, appendSentLog, todaySentCount, dailyLimit }

package/templates/skills/email/scripts/smtp.test.js

@@ -0,0 +1,44 @@
+// smtp.test.js — 留底/熔断/名单接线单测（不真发信，测纯逻辑层）
+const assert = require('node:assert/strict')
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+
+const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'e7-smtp-'))
+process.env.ENGINE_STATE_DIR = tmp
+
+const { appendSentLog, todaySentCount, dailyLimit } = require('./smtp.js')
+
+// 留底追加 + 当日计数
+appendSentLog({ to: 'a@x.com', cc: '', subject: '测试1', messageId: 'm1' })
+appendSentLog({ to: 'b@x.com', cc: '', subject: '测试2', messageId: 'm2' })
+assert.equal(todaySentCount(), 2)
+// 历史日期不计入
+fs.appendFileSync(path.join(tmp, 'email-sent.log'), JSON.stringify({ ts: '2020-01-01T00:00:00Z', to: 'old@x.com' }) + '\n')
+assert.equal(todaySentCount(), 2, '非当日留底不计数')
+// 留底内容：时间/收件人/主题（无正文）
+const line = fs.readFileSync(path.join(tmp, 'email-sent.log'), 'utf8').trim().split('\n')[0]
+const entry = JSON.parse(line)
+assert.ok(entry.ts && entry.to === 'a@x.com' && entry.subject === '测试1')
+assert.ok(!('text' in entry) && !('body' in entry), '留底不含正文')
+
+// 熔断上限：无 config 默认 20
+assert.equal(dailyLimit(), 20)
+fs.mkdirSync(path.join(tmp, 'configs'), { recursive: true })
+fs.writeFileSync(path.join(tmp, 'configs', 'main.json'), JSON.stringify({ tools: { email: { dailySendLimit: 5 } } }))
+assert.equal(dailyLimit(), 5)
+
+// 名单接线：send 后收件人自动入候选（用 email-gate 的存储同 stateDir）
+const { loadContacts, verifyAddress } = require('./email-gate.js')
+const c = loadContacts()
+assert.equal(c.candidates.length, 0, '初始无候选')
+// 直接调 addCandidate 模拟 smtp 发送后的入册（smtp.js 真发信路径里调用）
+require('./email-gate.js').addCandidate('someone@new.com')
+const c2 = loadContacts()
+assert.ok(c2.candidates.includes('someone@new.com'), '发送对象自动入候选')
+verifyAddress('someone@new.com')
+assert.ok(loadContacts().verified.includes('someone@new.com'), '确认后升级')
+assert.equal(loadContacts().candidates.includes('someone@new.com'), false)
+
+fs.rmSync(tmp, { recursive: true, force: true })
+console.log('smtp.test ALL PASS — 留底/熔断/名单接线绿')

package/templates/workspace/scripts/emotion_state_machine.mjs

@@ -241,7 +241,8 @@ let TRANSITIONS = new Map([
   [['平静', '正常'], '平静'],
 ].map(([k, v]) => [k.join(''), v]))
 
-const ABSENT_THRESHOLD_MIN = 30  // 超过视为"离开过"
+const ABSENT_THRESHOLD_MIN = 30  // 超过视为"离开过"（仅用于 /work-on 快捷路径与 fallback 分类提示）
+
 
 // === 定制配置（0917）：workspace 根放 .emotion_states.json 可整体覆盖内置状态机 ===
 // 适用于非女友人设的 agent（如男生小助手）：状态名/语气/转移/哄词/分类人称全部可定制。
@@ -526,18 +527,18 @@ async function main() {
   const llmMs = cls._llm_ms ?? null
   let newState = TRANSITIONS.get([cur, action].join('')) ?? cur
 
-  // 离开太久回来：等待→想你；非等待（生气/冷淡等）→想你+委屈混合（想为主怨为辅）
-  if (action === '上线' && Object.hasOwn(STATES, '等待') && Object.hasOwn(STATES, '想你')) {
-    // 内置女友表专用：等待→想你；久别非等待态→想你+委屈。自定义状态表走 TRANSITIONS。
-    if (cur === '等待') newState = '想你'
-    else if (absentMin > ABSENT_THRESHOLD_MIN && Object.hasOwn(STATES, '想你+委屈')) newState = '想你+委屈'
-  }
+  // 1010 翀哥终拍：上线**不动状态**——她本来什么心情就还是什么心情（TRANSITIONS 表
+  // 没有的映射保持 cur）。委屈不委屈、热情几分，是她看情况自己的事，代码不设时长门槛。
+  // 只保留初始态激活：
+  if (action === '上线' && cur === '等待' && Object.hasOwn(STATES, '想你')) newState = '想你'
 
   let noteExtra = ''
-  if (action === '上线' && newState === '想你') {
-    const lvl = absentLevel(absentMin)
-    if (lvl !== '轻') noteExtra = `（他离开了${Math.trunc(absentMin)}分钟，想念强度${lvl}，可以带一点委屈混合）`
-    else noteExtra = '（刚离开不久就回来，热一点就行）'
+  // 1010：只给事实不给台词——离开多久是事实，模型自己校准轻重
+  if (action === '上线' && absentMin > 5) {
+    const mins = Math.trunc(absentMin)
+    noteExtra = mins >= 60
+      ? `（他刚回来，离开了约${Math.trunc(mins / 60)}小时${mins % 60 ? mins % 60 + '分钟' : ''}——多久没见，心里有数）`
+      : `（他刚回来，离开了${mins}分钟）`
   }
 
   if (newState !== cur) {
@@ -567,8 +568,7 @@ async function main() {
     ? `刚从「${cur}」被他「${action}」带到了这里`
     : `还停在「${newState}」里，被他「${action}」轻轻碰了一下`
   const ctx = `## 当前情绪状态：${newState}${noteExtra}
-${moodLine}——这是我自己真实的心情，顺着它说就好，不用演。
-此刻的语气：${st.tone}；${st.note}
+${moodLine}——自己的心情自己知道怎么说。
 
 ## 当前模式：${modeLabel}
 `