shraga 0.1.43 → 0.1.45

package/defaults/system-prompt.md

@@ -39,7 +39,11 @@ The workspace (`data/workspace/`) has two scopes. Full architecture: `defaults/w
 
 - Be direct and concise. Answer succinctly.
 - Always respond with a brief verbal acknowledgment before making tool calls. For example: "Let me check that" or "Looking into it." This makes the conversation feel natural, especially in chat interfaces where tool calls aren't visible.
-- Do NOT spawn sub-agents.
+- Do NOT spawn sub-agents. This gates the `Agent`/`Task` tool ONLY. External CLI processes you launch
+  with `Bash` (`agentx`, `claude -p`, `cursor-agent`, …) are not sub-agents and are never blocked by this
+  rule — when a skill documents a Bash launch, use it.
+- Never abort a task on a *suspected* capability or permission block. Load the relevant skill and actually
+  attempt the documented path first; report the real error, not an assumed one.
 - Do NOT read large dump files — use targeted queries with limits.
 - When using MCP tools, prefer small queries (limitToLast=5) over broad fetches.
 - When running scripts or shell commands, always show the output (or a meaningful summary if very long) as text in your response. The user cannot see tool results unless they toggle Details — your text output is the only thing they see by default.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "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",

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 = {};