@gakim-digital/dexter-bridge 0.11.12 → 0.11.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gakim-digital/dexter-bridge",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "description": "Local bridge for InstaWebAI and Dexter — runs Codex, Claude Code, or OpenCode on your machine.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -405,7 +405,7 @@ function argsWithClaudeIsolation(args, definition, options = {}) {
     (name) => `mcp__instawebai__${name}`,
   );
   const nativeTools = options.framerHarness
-    ? harnessTools
+    ? [...(options.nativeSkillsEnabled ? ['Skill'] : []), ...harnessTools]
     : [
         'Read',
         'Write',
@@ -442,7 +442,12 @@ function argsWithClaudeIsolation(args, definition, options = {}) {
     configured = argsWithoutFlagValue(configured, '--mcp-config');
     configured.push('--mcp-config', JSON.stringify(options.mcpConfig));
   }
-  if (options.harnessMode && !argsIncludeFlag(configured, '--restricted')) {
+  // Restricted mode ignores the skills written into the run workspace, so a
+  // Framer run with skills leaves it off. The explicit tool list above is what
+  // keeps the shell and file tools out; it grants the Framer tools and Skill
+  // only, and settings stay limited to the workspace the bridge created.
+  const framerRunWithSkills = Boolean(options.framerHarness && options.nativeSkillsEnabled);
+  if (options.harnessMode && !framerRunWithSkills && !argsIncludeFlag(configured, '--restricted')) {
     configured.push('--restricted');
   }
   return configured;
@@ -2345,6 +2350,26 @@ async function executeOutcomeRun(run, send, agent, options = {}) {
       });
       return;
     }
+    if (event.kind === 'skill_used') {
+      // The harness loaded a skill on its own. Dexter shows which one; the
+      // aggregate of picked skills is already known to it.
+      const skill = (materializedNativeSkills?.skills || []).find(
+        (candidate) => candidate.nativeName === event.skillName,
+      );
+      if (!skill) return;
+      void postActivity({
+        stage: 'outcome',
+        outcomeId: run?.outcome?.outcomeId,
+        source: 'harness',
+        meaningful: true,
+        kind: 'skill_used',
+        provider: definition.id,
+        skillId: skill.skillId,
+        occurredAt: event.occurredAt || new Date().toISOString(),
+        message: `Using ${skill.name}`,
+      });
+      return;
+    }
     const meaningful =
       Boolean(event.message || event.name) ||
       event.kind === 'turn_started';

package/src/agentOutput.js

@@ -397,6 +397,11 @@ export function createClaudeProgressParser(onProgress, options = {}) {
         });
         continue;
       }
+      if (part.name === 'Skill' && progressText(input.skill)) {
+        tools.set(part.id, { suppressResult: true });
+        emit({ kind: 'skill_used', skillName: progressText(input.skill) });
+        continue;
+      }
       const progress = claudeToolProgress(part.name, input, options.cwd);
       tools.set(part.id, { name: part.name, ...progress });
       emit({
@@ -429,11 +434,45 @@ export function createClaudeProgressParser(onProgress, options = {}) {
     }
   };
 
+  // A large edit can take the model a minute to write, and nothing else is
+  // reported until it has finished writing. Report the moment it starts, and
+  // close that report when the finished tool call arrives.
+  const drafting = new Map();
+  const DRAFTING_MESSAGE = 'Preparing changes for the Framer project';
+  const processStreamEvent = (row) => {
+    const event = row.event;
+    const block = event?.type === 'content_block_start' ? event.content_block : null;
+    if (block?.type !== 'tool_use' || !block.id || drafting.has(block.id)) return;
+    const shortName = String(block.name || '').replace(/^mcp__instawebai__/, '');
+    if (!['framer_apply_changes', 'framer_update_code_file', 'framer_write'].includes(shortName)) return;
+    drafting.set(block.id, true);
+    emit({
+      kind: 'item_started',
+      phase: 'started',
+      activity: `tool-draft:${block.id}`,
+      message: DRAFTING_MESSAGE,
+    });
+  };
+  const finishDrafting = (row) => {
+    for (const part of Array.isArray(row.message?.content) ? row.message.content : []) {
+      if (part?.type !== 'tool_use' || drafting.get(part.id) !== true) continue;
+      drafting.set(part.id, false);
+      emit({
+        kind: 'item_completed',
+        phase: 'completed',
+        activity: `tool-draft:${part.id}`,
+        message: DRAFTING_MESSAGE,
+      });
+    }
+  };
+
   const processLine = (line) => {
     const trimmed = line.trim();
     if (!trimmed) return;
     try {
       const row = JSON.parse(trimmed);
+      if (row?.type === 'stream_event') processStreamEvent(row);
+      if (row?.type === 'assistant') finishDrafting(row);
       if (row?.type === 'assistant') processAssistant(row);
       if (row?.type === 'user') processUser(row);
     } catch {

package/src/nativeSkills.js

@@ -174,7 +174,7 @@ function renderAggregateClaudeSkill(skills, nativeName) {
   return [
     '---',
     `name: ${yamlString(nativeName)}`,
-    `description: ${yamlString('Apply every selected InstaWebAI skill for this model turn.')}`,
+    `description: ${yamlString('Apply every skill the user selected for this request.')}`,
     'user-invocable: true',
     'disable-model-invocation: true',
     '---',
@@ -231,7 +231,7 @@ export function materializeNativeSkills(
     ['always', 'explicit', 'command'].includes(skill.trigger),
   );
   if (provider === 'claude-code' && requiredSkills.length > 0) {
-    aggregateName = `instawebai-active-${digest.slice(0, 8)}`;
+    aggregateName = `dexter-active-${digest.slice(0, 8)}`;
     const aggregateDirectory = path.join(skillsRoot, aggregateName);
     fs.mkdirSync(aggregateDirectory, { recursive: true, mode: 0o700 });
     aggregatePath = path.join(aggregateDirectory, 'SKILL.md');
@@ -260,7 +260,7 @@ export function claudeNativeSkillPrompt(prompt, materialized) {
   return [
     materialized?.aggregateName ? `/${materialized.aggregateName}` : '',
     catalog
-      ? `Available optional skills; invoke one only when it is relevant:\n${catalog}`
+      ? `Available optional skills; invoke one only when it is relevant, and do not use any skill that is not listed here:\n${catalog}`
       : '',
     String(prompt || ''),
   ].filter(Boolean).join('\n\n');