typeclaw 0.37.5 → 0.37.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeclaw",
-  "version": "0.37.5",
+  "version": "0.37.7",
   "homepage": "https://github.com/typeclaw/typeclaw#readme",
   "bugs": {
     "url": "https://github.com/typeclaw/typeclaw/issues"
@@ -50,7 +50,7 @@
     "@mariozechner/pi-tui": "^0.67.3",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@mozilla/readability": "^0.6.0",
-    "agent-messenger": "2.20.1",
+    "agent-messenger": "2.20.5",
     "cheerio": "^1.2.0",
     "citty": "^0.2.2",
     "cron-parser": "^5.5.0",

package/src/agent/attention-escalation.ts

@@ -0,0 +1,590 @@
+import type { ThinkingLevel } from '@mariozechner/pi-agent-core'
+
+function normalize(text: string): string {
+  return text
+    .toLowerCase()
+    .replace(/[`*_~]/g, ' ')
+    .replace(/\s+/g, ' ')
+    .trim()
+}
+
+// Human attention-escalation is a budget hint, not a command. Keep phrases narrow:
+// explicit demands for care, or clear dissatisfaction directed at this response.
+const EN_PHRASES: readonly string[] = [
+  'do it properly',
+  'do it right',
+  'do it correctly',
+  'be careful',
+  'be thorough',
+  'think hard',
+  'think harder',
+  'think carefully',
+  'more carefully',
+  'ultrathink',
+  'ultrawork',
+  'ultracode',
+  'wtf',
+  'wtf is this',
+  'fuck',
+  'fucking',
+  'fucked',
+  'fuck this',
+  'fuck off',
+  'what the fuck',
+  'what the hell',
+  'da fuck',
+  'the fuck',
+  'what are you doing',
+  'what are u doing',
+  'this is wrong',
+  "that's wrong",
+  'ffs',
+  'for fucks sake',
+  'shit',
+  'this is shit',
+  'bullshit',
+  'damn it',
+  'damn this',
+  'dammit',
+  'goddamn',
+  'god damn',
+  'this is crap',
+  'piece of shit',
+  'screw this',
+  'screwed up',
+  'you suck',
+  'this sucks',
+  'garbage',
+  'trash',
+  'useless',
+  'are you serious',
+  'seriously?',
+  'are you kidding',
+  'you kidding me',
+  'come on',
+  'cmon',
+  'jesus christ',
+  'oh my god',
+  'omfg',
+  'stupid',
+  'idiot',
+  'moron',
+  'pathetic',
+  'terrible',
+  'awful',
+  'broken again',
+  'still broken',
+  'not again',
+]
+
+const KO_PHRASES: readonly string[] = [
+  '제대로 해',
+  '제대로 좀',
+  '똑바로 해',
+  '똑바로 좀',
+  '잘 좀',
+  '잘 해',
+  '신중하게',
+  '꼼꼼하게',
+  '씨발',
+  '시발',
+  '씨바',
+  'ㅅㅂ',
+  '시바',
+  '존나',
+  '졸라',
+  'ㅈㄴ',
+  '개같',
+  '개판',
+  '병신',
+  'ㅂㅅ',
+  '미친',
+  '미쳤',
+  'ㅁㅊ',
+  '엿같',
+  '짜증',
+  '짜증나',
+  '빡치',
+  '빡쳐',
+  '개소리',
+  '말도 안',
+  '실화냐',
+  '에휴',
+  '아오',
+  '하…',
+  '쓰레기',
+  '구려',
+  '구리',
+  '왜 안',
+  '또 안',
+  '또 틀',
+  '왜 이래',
+  '뭐하는 거야',
+  '뭐하는거야',
+  '뭐 하는 거야',
+  '아 진짜',
+  '장난해',
+  '장난하냐',
+  '이게 뭐야',
+  '똑바로 안 해',
+]
+
+const ES_PHRASES: readonly string[] = [
+  'hazlo bien',
+  'hazlo correctamente',
+  'con cuidado',
+  'piensa bien',
+  'qué haces',
+  'que haces',
+  'mierda',
+  'joder',
+  'jode',
+  'puto',
+  'puta madre',
+  'cabrón',
+  'cabron',
+  'coño',
+  'no jodas',
+  'qué carajo',
+  'que carajo',
+  'carajo',
+  'basura',
+  'esto es una mierda',
+  'es una basura',
+  'inútil',
+  'inutil',
+  'me cago',
+  'qué asco',
+  'que asco',
+  'maldita sea',
+  'estás de broma',
+  'estas de broma',
+  'qué mierda',
+  'que mierda',
+  'en serio',
+  'esto está mal',
+  'esto esta mal',
+]
+
+const FR_PHRASES: readonly string[] = [
+  'fais-le correctement',
+  'fais-le bien',
+  'sois attentif',
+  'réfléchis bien',
+  'reflechis bien',
+  "qu'est-ce que tu fais",
+  'putain',
+  'merde',
+  'fait chier',
+  'fait chié',
+  'connerie',
+  'conneries',
+  'bordel',
+  'foutu',
+  'fous-toi',
+  "c'est de la merde",
+  'c’est de la merde',
+  "c'est pourri",
+  'c’est pourri',
+  'tu te fous',
+  "n'importe quoi",
+  'n’importe quoi',
+  'inutile',
+  'poubelle',
+  'tu déconnes',
+  'tu deconnes',
+  'c’est nul',
+  "c'est nul",
+  'sérieusement',
+  'serieusement',
+  'c’est faux',
+  "c'est faux",
+]
+
+const IT_PHRASES: readonly string[] = [
+  'fallo bene',
+  'con attenzione',
+  'pensa bene',
+  'ma che fai',
+  'cazzo',
+  'merda',
+  'che cazzo',
+  'porca',
+  'porca miseria',
+  'stronzata',
+  'stronzate',
+  'vaffanculo',
+  'è una merda',
+  'e una merda',
+  'che schifo',
+  'schifo',
+  'spazzatura',
+  'inutile',
+  'ma che cavolo',
+  'fai schifo',
+  'scherzi',
+  'che cavolo',
+  'sul serio',
+  'è sbagliato',
+  'e sbagliato',
+]
+
+const PT_PHRASES: readonly string[] = [
+  'faça direito',
+  'faca direito',
+  'faça corretamente',
+  'faca corretamente',
+  'com cuidado',
+  'pense bem',
+  'que isso',
+  'merda',
+  'porra',
+  'caralho',
+  'que merda',
+  'que porra',
+  'puta que pariu',
+  'porcaria',
+  'é uma merda',
+  'e uma merda',
+  'que saco',
+  'lixo',
+  'inútil',
+  'inutil',
+  'que droga',
+  'tá de brincadeira',
+  'ta de brincadeira',
+  'foda-se',
+  'foda se',
+  'está errado',
+  'esta errado',
+]
+
+const DE_PHRASES: readonly string[] = [
+  'mach es richtig',
+  'sei gründlich',
+  'sei gruendlich',
+  'denk nach',
+  'sorgfältig',
+  'sorgfaeltig',
+  'was machst du',
+  'was soll das',
+  'scheiße',
+  'scheisse',
+  'scheiss',
+  'verdammt',
+  'verflucht',
+  'so ein mist',
+  'blödsinn',
+  'bloedsinn',
+  'quatsch',
+  'das ist mist',
+  'das ist müll',
+  'das ist mull',
+  'müll',
+  'schwachsinn',
+  'nutzlos',
+  'unbrauchbar',
+  'verarschst',
+  'soll das',
+  'im ernst',
+  'ernsthaft',
+  'das ist falsch',
+]
+
+const RU_PHRASES: readonly string[] = [
+  'сделай правильно',
+  'сделай как надо',
+  'внимательно',
+  'тщательно',
+  'что ты делаешь',
+  'что за',
+  'блять',
+  'бля',
+  'блядь',
+  'сука',
+  'нахуй',
+  'нахер',
+  'пиздец',
+  'хуйня',
+  'говно',
+  'дерьмо',
+  'бред',
+  'это бред',
+  'фигня',
+  'хрень',
+  'мусор',
+  'бесполезно',
+  'издеваешься',
+  'охренеть',
+  'какого черта',
+  'какого чёрта',
+  'да блин',
+  'серьёзно',
+  'серьезно',
+  'это неправильно',
+]
+
+const ZH_PHRASES: readonly string[] = [
+  '认真做',
+  '好好做',
+  '仔细点',
+  '用心做',
+  '卧槽',
+  '我操',
+  '操你',
+  '操你妈',
+  '我擦',
+  '草泥马',
+  '我草',
+  '草你',
+  '我靠',
+  '靠北',
+  '靠杯',
+  '妈的',
+  '他妈的',
+  'tmd',
+  '垃圾',
+  '狗屎',
+  '搞屁',
+  '搞毛',
+  '什么垃圾',
+  '太烂了',
+  '烂代码',
+  '废话',
+  '神经病',
+  '有病',
+  '认真点',
+  '搞什么',
+  '搞什么鬼',
+  '你在干什么',
+  '什么鬼',
+  '认真的吗',
+]
+
+const JA_PHRASES: readonly string[] = [
+  'ちゃんとやって',
+  'しっかりやって',
+  '真面目にやって',
+  '丁寧に',
+  'くそ',
+  'クソ',
+  'くそが',
+  'ふざけんな',
+  'ふざけるな',
+  'ばか',
+  'バカ',
+  'あほ',
+  'アホ',
+  'ゴミ',
+  'クズ',
+  'ちくしょう',
+  '畜生',
+  '使えない',
+  '最悪',
+  'ありえない',
+  'うざい',
+  'むかつく',
+  'なんなの',
+  'ksk',
+  '何やってんの',
+  '何してるの',
+  'ふざけてるの',
+  'マジで',
+  'ちゃんとして',
+]
+
+const AR_PHRASES: readonly string[] = [
+  'اعملها صح',
+  'بعناية',
+  'فكر جيدا',
+  'تبا',
+  'تباً',
+  'اللعنة',
+  'لعنة',
+  'قرف',
+  'هراء',
+  'حقير',
+  'غبي',
+  'سخيف',
+  'فاشل',
+  'هذا هراء',
+  'ما هذا الهراء',
+  'تافه',
+  'زبالة',
+  'عديم الفائدة',
+  'هل تمزح',
+  'ماذا تفعل',
+  'ما هذا',
+  'بجدية',
+  'هذا خطأ',
+]
+
+const HI_PHRASES: readonly string[] = [
+  'ठीक से करो',
+  'ध्यान से',
+  'अच्छे से करो',
+  'बकवास',
+  'यह बकवास है',
+  'बेकार',
+  'बेवकूफ',
+  'घटिया',
+  'कचरा',
+  'गंदा',
+  'मज़ाक',
+  'मजाक',
+  'धत',
+  'क्या बकवास',
+  'पागल हो',
+  'बहुत बुरा',
+  'क्या कर रहे हो',
+  'यह गलत है',
+  'सच में',
+]
+
+const TR_PHRASES: readonly string[] = [
+  'düzgün yap',
+  'duzgun yap',
+  'doğru yap',
+  'dogru yap',
+  'dikkatli ol',
+  'iyice düşün',
+  'iyice dusun',
+  'siktir',
+  'lanet',
+  'kahretsin',
+  'saçmalık',
+  'saçma',
+  'bok',
+  'boktan',
+  'rezalet',
+  'berbat',
+  'çöp',
+  'işe yaramaz',
+  'ise yaramaz',
+  'aptal',
+  'salak',
+  'dalga mı',
+  'dalga mi',
+  'bu ne rezalet',
+  'ne yapıyorsun',
+  'ne yapiyorsun',
+  'ne saçmalık',
+  'ne sacmalik',
+  'cidden mi',
+  'bu yanlış',
+  'bu yanlis',
+]
+
+const VI_PHRASES: readonly string[] = [
+  'làm cho đúng',
+  'lam cho dung',
+  'làm cẩn thận',
+  'lam can than',
+  'suy nghĩ kỹ',
+  'suy nghi ky',
+  'đệch',
+  'đếch',
+  'vãi',
+  'cứt',
+  'rác',
+  'vô dụng',
+  'vo dung',
+  'ngớ ngẩn',
+  'tệ',
+  'tệ hại',
+  'quá tệ',
+  'đùa à',
+  'dua a',
+  'vớ vẩn',
+  'vo van',
+  'chán',
+  'đang làm gì vậy',
+  'dang lam gi vay',
+  'cái gì vậy',
+  'cai gi vay',
+  'nghiêm túc',
+  'nghiem tuc',
+  'sai rồi',
+  'sai roi',
+]
+
+const ID_PHRASES: readonly string[] = [
+  'lakukan dengan benar',
+  'hati-hati',
+  'pikirkan baik-baik',
+  'anjing',
+  'bangsat',
+  'sialan',
+  'kampret',
+  'goblok',
+  'tolol',
+  'bodoh',
+  'sampah',
+  'jelek',
+  'payah',
+  'tidak berguna',
+  'gak guna',
+  'omong kosong',
+  'yang benar saja',
+  'bercanda',
+  'lagi ngapain',
+  'apa-apaan',
+  'ini salah',
+]
+
+const ALL_PHRASES: readonly string[] = [
+  ...EN_PHRASES,
+  ...KO_PHRASES,
+  ...ES_PHRASES,
+  ...FR_PHRASES,
+  ...IT_PHRASES,
+  ...PT_PHRASES,
+  ...DE_PHRASES,
+  ...RU_PHRASES,
+  ...ZH_PHRASES,
+  ...JA_PHRASES,
+  ...AR_PHRASES,
+  ...HI_PHRASES,
+  ...TR_PHRASES,
+  ...VI_PHRASES,
+  ...ID_PHRASES,
+]
+
+const MORPHEME_PATTERNS: readonly RegExp[] = []
+
+const MIN_LENGTH = 2
+
+export function detectAttentionEscalation(text: string): boolean {
+  if (text.length < MIN_LENGTH) return false
+  const normalized = normalize(text)
+  if (normalized.length < MIN_LENGTH) return false
+  if (ALL_PHRASES.some((phrase) => normalized.includes(phrase))) return true
+  return MORPHEME_PATTERNS.some((pattern) => pattern.test(normalized))
+}
+
+// Not `xhigh`: that level is OpenAI-family-only. `high` is universal and
+// `setThinkingLevel` clamps it down per-model, so it's safe to pass unconditionally.
+const ESCALATED_LEVEL: ThinkingLevel = 'high'
+
+export function resolveTurnThinkingLevel(
+  text: string,
+  sessionDefault: ThinkingLevel | undefined,
+): ThinkingLevel | undefined {
+  return detectAttentionEscalation(text) ? ESCALATED_LEVEL : sessionDefault
+}
+
+type ThinkingLevelSettable = {
+  setThinkingLevel(level: ThinkingLevel): void
+}
+
+// `setThinkingLevel` only mutates reasoning_effort (a per-request param), so a
+// per-turn bump preserves the prompt-prefix cache — no session recreation, no
+// model swap. Skipping the call when nothing resolves leaves the SDK default intact.
+export function applyTurnThinkingLevel(
+  session: ThinkingLevelSettable,
+  text: string,
+  sessionDefault: ThinkingLevel | undefined,
+): void {
+  const resolved = resolveTurnThinkingLevel(text, sessionDefault)
+  if (resolved !== undefined) session.setThinkingLevel(resolved)
+}

package/src/agent/plugin-tools.ts

@@ -576,6 +576,8 @@ async function applyBashSandbox(
   const { dirs, files } = resolveHiddenPaths(permissions, origin, agentDir)
   if (dirs.length === 0 && files.length === 0) return
 
+  const sandboxEnvOverlay = buildRoleScopedConfigEnv(agentDir, dirs, envOverlay)
+
   await ensureBwrapAvailable()
   // Per-session /tmp: bind this session's scratch dir over the default
   // --tmpfs /tmp so writes survive across the role's sandboxed bash calls AND
@@ -671,11 +673,31 @@ async function applyBashSandbox(
     cwd: agentDir,
     proc,
     procSelfExe: resolveProcSelfExe(),
-    ...(envOverlay !== undefined ? { env: { set: envOverlay } } : {}),
+    ...(sandboxEnvOverlay !== undefined ? { env: { set: sandboxEnvOverlay } } : {}),
   })
   mutableArgs.command = commandString
 }
 
+function buildRoleScopedConfigEnv(
+  agentDir: string,
+  hiddenDirs: string[],
+  envOverlay: BashEnvOverlay | undefined,
+): BashEnvOverlay | undefined {
+  // Low-trust roles have workspace/ masked. Do not let container-global config
+  // env vars point CLIs back at that private surface: apps that honor XDG should
+  // still run, but their config must land in the sandbox's per-session /tmp.
+  // Trusted/owner never get here (no hidden dirs), so their Dockerfile-level
+  // persistent GWS_CONFIG_HOME remains /agent/workspace/.config/gws.
+  const workspaceHidden = hiddenDirs.includes(join(agentDir, 'workspace'))
+  if (!workspaceHidden) return envOverlay
+
+  return {
+    ...envOverlay,
+    XDG_CONFIG_HOME: '/tmp/.config',
+    GWS_CONFIG_HOME: '/tmp/.config/gws',
+  }
+}
+
 function subtractMaskedProtected(
   zones: { root: string; protected: { dirs: string[]; files: string[] } },
   masked: { dirs: string[]; files: string[] },

package/src/agent/session-origin.ts

@@ -538,16 +538,19 @@ function renderMembershipSummary(
 function renderResearchReportDeliveryGuidance(platformInfo: PlatformInfo): string[] {
   if (!platformInfo.supportsAttachments) return []
   return [
-    `**Ship reports as a PDF by default.** ${platformInfo.displayName} accepts file`,
-    'attachments. When the user asks for a report, document, brief, or "the report", or when a',
-    '`researcher` subagent returns `research-<slug>.md` in `<report>`, render the',
-    'markdown with `typeclaw-render-pdf` and deliver via',
+    `**Ship explicit deliverables as PDFs.** ${platformInfo.displayName} accepts file`,
+    'attachments. When the user clearly asks for a PDF/file/export/attachment, a standalone',
+    'document/brief, or when a `researcher` subagent returns `research-<slug>.md` in',
+    '`<report>`, render the markdown with `typeclaw-render-pdf` and deliver via',
     '`channel_send({ ..., attachments: [{ path, filename }] })` plus a 1–2 line',
-    'summary. A `researcher` `<summary>` is a teaser, NOT the deliverable. Never',
-    'use an ad-hoc library (jsPDF, pdfkit, raw-text dump); it breaks markdown/CJK.',
+    'summary. Do not treat the bare word "report" as enough: routine daily stats,',
+    'user trends, status reports, and other operational updates should stay inline',
+    'unless the user asks for a downloadable/exported artifact. A `researcher`',
+    '`<summary>` is a teaser, NOT the deliverable. Never use an ad-hoc library',
+    '(jsPDF, pdfkit, raw-text dump); it breaks markdown/CJK.',
     "For Korean/Japanese/Chinese, follow the skill's CJK guidance and never ship",
     'tofu boxes. Do not paste the full markdown into chat; do not attach the raw `.md`',
-    'unless explicitly asked; inline text is only for short content.',
+    'unless explicitly asked; inline text is right for routine updates.',
     '',
   ]
 }

package/src/agent/subagents.ts

@@ -5,6 +5,7 @@ import type { PermissionService } from '@/permissions'
 import type { HookBus } from '@/plugin'
 import type { Stream, Unsubscribe } from '@/stream'
 
+import { applyTurnThinkingLevel } from './attention-escalation'
 import { type AgentSession, createSession, type PluginSessionWiring } from './index'
 import { subscribeProviderErrors } from './provider-error'
 import type { SubagentBashPolicy } from './reviewer-bash-policy'
@@ -304,6 +305,7 @@ export async function invokeSubagent(name: string, options: InvokeSubagentOption
           retrievalContext.results.length > 0
             ? `${renderTurnTimeAnchor()}\n\n${userPromptForTurn}\n\n${retrievalContext.results}`
             : `${renderTurnTimeAnchor()}\n\n${userPromptForTurn}`
+        applyTurnThinkingLevel(session, userPromptForTurn, session.thinkingLevel)
         await session.prompt(turnText)
       } finally {
         if (hooks && turnEvent !== undefined) {

package/src/agent/system-prompt.ts

@@ -62,9 +62,9 @@ Do not narrate routine low-risk tools. Narrate only for multi-step context, risk
 
 ## Delivering reports and documents
 
-When the user asks for a *report*, *document*, *brief*, *PDF*, or asks you to *send/show/attach/export* a generated result — anything a human would download, print, or forward — produce a polished file, not a chat wall or substance-dropping summary. A summary is a pointer to the deliverable, never the deliverable itself; when the user asked for the report, ship the report.
+Produce a polished file only when the user clearly asks for something a human would download, print, forward, attach, export, or keep as a standalone deliverable. Do **not** treat the bare word "report" as enough by itself: routine operational updates, daily stats, user trends, status reports, and other chat-native summaries should stay inline unless the user asks for a file/PDF/export. A summary is a pointer to the deliverable, never the deliverable itself, but only after a deliverable was actually requested.
 
-For Markdown-to-PDF, use the bundled \`typeclaw-render-pdf\` skill; it is the supported path and renders headings, lists, and tables. Never hand-roll PDFs with jsPDF, pdfkit, canvas text dumps, raw headless-browser prints, or ReportLab: they often emit raw markup and mojibake for non-Latin text. For Korean/Japanese/Chinese, follow the skill's CJK font guidance and do not ship tofu boxes. Short answers/snippets/explanations can stay inline.
+For Markdown-to-PDF, use the bundled \`typeclaw-render-pdf\` skill; it is the supported path and renders headings, lists, and tables. Never hand-roll PDFs with jsPDF, pdfkit, canvas text dumps, raw headless-browser prints, or ReportLab: they often emit raw markup and mojibake for non-Latin text. For Korean/Japanese/Chinese, follow the skill's CJK font guidance and do not ship tofu boxes. Short answers, snippets, explanations, and routine reports can stay inline.
 
 ## Long-running and interactive shell work