shraga 0.1.42 → 0.1.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "The teammate you delegate coding to — a self-hostable, multi-user AI coding agent web UI (Claude Code, with a pluggable engine seam).",
   "type": "module",
   "main": "./src/index.ts",
@@ -70,7 +70,7 @@
     "express": "^4.21.1",
     "firebase": "^11.0.0",
     "lucide-react": "^0.468.0",
-    "mcp-slack-use": "github:Livshitz/mcp-slack-use#1dde291",
+    "mcp-slack-use": "github:Livshitz/mcp-slack-use#38ff8b7",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-markdown": "^9.0.0",

package/src/server/data-sync.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync, statSync } from 'no
 import path from 'node:path';
 import { DATA_DIR } from './paths.ts';
 import { emitEvent } from './events/bus.ts';
+import { runTextQuery } from './sdk-utils.ts';
 
 const TAG = '[data-sync]';
 const DEPLOYMENT_ID_FILE = '.deployment-id';
@@ -340,7 +341,7 @@ export class DataSync {
       const msg = await this.askClaude(
         'Write a concise git commit message (max 72 chars, no quotes, no prefix like "feat:" or "sync:") for this change to an AI agent\'s behavioral config.\n' +
         `Files: ${files.join(', ')}\nStats: ${diff}\n\nDiff:\n${truncated}`,
-        'claude-haiku-4-5-20251001', 100,
+        'haiku',
       );
       const line = msg.split('\n')[0].trim().slice(0, 72);
       return line || fallback;
@@ -382,7 +383,7 @@ export class DataSync {
         'Output format:\n' +
         '<file path="<path>" complexity="trivial|ambiguous" reason="short explanation">\n<resolved content>\n</file>\n' +
         'Output ONLY the resolved files in this format.\n\n' + sections,
-        'claude-opus-4-6',
+        'opus',
       );
 
       const parsed = this.parseResolvedFiles(resolved);
@@ -462,7 +463,7 @@ export class DataSync {
         'Output format:\n' +
         '<file path="<path>" complexity="trivial|ambiguous" reason="short explanation">\n<resolved content>\n</file>\n' +
         'Output ONLY the resolved files.\n\n' + sections,
-        'claude-opus-4-6',
+        'opus',
       );
 
       const parsed = this.parseResolvedFiles(resolved);
@@ -564,24 +565,15 @@ export class DataSync {
     emitEvent('data-sync', { kind: 'deploy', owners, text });
   }
 
-  private async askClaude(prompt: string, model = 'claude-sonnet-5', maxTokens = 8192): Promise<string> {
-    const apiKey = process.env.ANTHROPIC_API_KEY;
-    if (!apiKey) throw new Error('ANTHROPIC_API_KEY not set');
-    const resp = await fetch('https://api.anthropic.com/v1/messages', {
-      method: 'POST',
-      headers: {
-        'x-api-key': apiKey,
-        'anthropic-version': '2023-06-01',
-        'content-type': 'application/json',
-      },
-      body: JSON.stringify({
-        model, max_tokens: maxTokens,
-        messages: [{ role: 'user', content: prompt }],
-      }),
-    });
-    if (!resp.ok) throw new Error(`Anthropic API ${resp.status}: ${await resp.text()}`);
-    const data = await resp.json() as { content: { type: string; text: string }[] };
-    return data.content.find(b => b.type === 'text')?.text || '';
+  /**
+   * Routed through the Claude Code SDK (runTextQuery), same as the rest of the platform —
+   * authenticates via the CC subscription, no ANTHROPIC_API_KEY required. Past incident:
+   * this used to hit the raw Anthropic Messages API directly with process.env.ANTHROPIC_API_KEY,
+   * which is unset on subscription-auth deployments — every merge-conflict resolution failed and
+   * spammed owners via notifyOwners().
+   */
+  private async askClaude(prompt: string, model: 'haiku' | 'sonnet' | 'opus' = 'sonnet'): Promise<string> {
+    return runTextQuery({ prompt, model, maxTurns: 1 });
   }
 
   private async getConflictedFiles(): Promise<string[]> {

package/src/server/directives.ts

@@ -23,12 +23,42 @@ import { MODEL_ALIASES } from './model-aliases.ts';
 
 const DIRECTIVE_RE = /^\s*\[([^\]]*)\]\s*([\s\S]*)/;
 
+const DIRECTIVE_KEYS = ['model', 'turns', 'thinking', 'think', 'effort', 'engine'];
+
+/** Does a bracket group look like directives (vs. prompt text that happens to start with `[`)?
+ * Every token must be a known key:value or a known positional, else we leave the group alone. */
+function isDirectiveGroup(raw: string): boolean {
+  const tokens = raw.split(',').map((t) => t.trim()).filter(Boolean);
+  if (!tokens.length) return false;
+  return tokens.every((t) => {
+    const colonIdx = t.indexOf(':');
+    if (colonIdx !== -1) return DIRECTIVE_KEYS.includes(t.slice(0, colonIdx).trim().toLowerCase());
+    const v = t.toLowerCase();
+    return !!MODEL_ALIASES[v] || /^\d+$/.test(v) || ['think', 'adaptive', 'nothink', 'nothinking'].includes(v);
+  });
+}
+
 export function parseDirectives(text: string): ParsedPrompt {
-  const match = text.match(DIRECTIVE_RE);
-  if (!match) return { prompt: text, directives: {} };
+  // Consume EVERY consecutive leading [..] group, not just the first. runner.ts prepends
+  // `[model] ` onto prompts that may already open with `[turns:120]`, so a single-group parse
+  // silently dropped the second — a schedule pinned to opus quietly ran on the config default
+  // for three days. Groups that don't parse as directives are left as prompt text.
+  let rest = text;
+  const groups: string[] = [];
+  for (;;) {
+    const m = rest.match(DIRECTIVE_RE);
+    if (!m) break;
+    const g = m[1].trim();
+    // The first group is always consumed (long-standing contract: `[unknown] hi` strips and warns).
+    // Later groups must actually look like directives, so prompt text such as `[WARN] …` survives.
+    if (groups.length && g && !isDirectiveGroup(g)) break;
+    groups.push(g);
+    rest = m[2];
+  }
+  if (!groups.length) return { prompt: text, directives: {} };
 
-  const raw = match[1].trim();
-  const prompt = match[2].trim();
+  const raw = groups.filter(Boolean).join(',');
+  const prompt = rest.trim();
   if (!raw) return { prompt, directives: {} };
 
   const directives: Directives = {};

package/src/server/engine/claude-code.ts

@@ -19,6 +19,7 @@ const IMMUTABLE_SYSTEM_PROMPT = readFileSync(path.resolve(import.meta.dirname, '
 const DEFAULT_USER_PROMPT = `You are a helpful assistant with access to MCP tools.`;
 const DEFAULT_ALLOWED_TOOLS = ['Read', 'Edit', 'Bash', 'WebSearch', 'Glob', 'LS', 'ToolSearch'];
 const BG_TASK_MAX_WAIT_MS = 15 * 60_000;
+const BG_HEARTBEAT_MS = 60_000;
 const HISTORY_LIMIT = 50;
 
 const NO_INTERACTIVE_ANSWER = 'No interactive channel is available to answer right now. Use your best judgement to proceed, and surface these options to the user in your reply so they can redirect if needed.';
@@ -313,7 +314,8 @@ export class ClaudeCodeEngine implements AgentEngine {
     let waitingForBg = false;
     let bgTimer: Promise<'__bgtimeout'> | null = null;
     let bgTimerHandle: ReturnType<typeof setTimeout> | null = null;
-    const clearBgTimer = () => { if (bgTimerHandle) { clearTimeout(bgTimerHandle); bgTimerHandle = null; } bgTimer = null; };
+    let bgHeartbeat: ReturnType<typeof setInterval> | null = null;
+    const clearBgTimer = () => { if (bgTimerHandle) { clearTimeout(bgTimerHandle); bgTimerHandle = null; } bgTimer = null; if (bgHeartbeat) { clearInterval(bgHeartbeat); bgHeartbeat = null; } };
 
     try {
       while (true) {
@@ -395,7 +397,14 @@ export class ClaudeCodeEngine implements AgentEngine {
           console.log(`[claude] Result: subtype=${m.subtype}→${sub} session=${lastSessionId} turns=${sdkTurns}/${maxTurns} cost=$${m.total_cost_usd?.toFixed(4) ?? '?'} msgs=${messageCount} deltas=${textDeltaCount} (${elapsed()})`);
           logCacheUsage(m.usage, activeModel);
           if (outstandingTasks.size > 0) {
-            if (!waitingForBg) { waitingForBg = true; clearBgTimer(); console.log(`[claude] Holding stream for ${outstandingTasks.size} bg tasks (${elapsed()})`); }
+            if (!waitingForBg) {
+              waitingForBg = true; clearBgTimer();
+              console.log(`[claude] Holding stream for ${outstandingTasks.size} bg tasks (${elapsed()})`);
+              // The hold is invisible to the user (their next message queues behind it), so beat
+              // every minute — otherwise a stuck task reads as a dead agent with nothing in the log.
+              bgHeartbeat = setInterval(() => console.log(`[claude] Still holding for ${outstandingTasks.size} bg task(s): ${[...outstandingTasks].join(',')} (${elapsed()})`), BG_HEARTBEAT_MS);
+              bgHeartbeat.unref?.();
+            }
             continue;
           }
           // The SDK reports `subtype: 'success'` even when the API call failed (e.g. an org spend