groove-dev 0.27.103 → 0.27.104

package/moe-training/client/index.js

@@ -8,3 +8,4 @@ export { TransmissionQueue } from './transmission-queue.js';
 export { EnvelopeBuilder } from './envelope-builder.js';
 export { StepClassifier } from './step-classifier.js';
 export { getParser } from './parsers/index.js';
+export { DomainTagger } from './domain-tagger.js';

package/moe-training/client/step-classifier.js

@@ -38,7 +38,7 @@ export class StepClassifier {
 
     const content = step.content || '';
 
-    if ((step.type === 'action' || step.type === 'observation') && ERROR_SIGNAL_RE.test(content)) {
+    if ((step.type === 'action' || step.type === 'observation') && step.is_error !== false && ERROR_SIGNAL_RE.test(content)) {
       step.type = 'error';
     }
 

package/moe-training/client/trajectory-capture.js

@@ -8,6 +8,7 @@ import { StepClassifier } from './step-classifier.js';
 import { EnvelopeBuilder } from './envelope-builder.js';
 import { SessionAttestation } from './session-attestation.js';
 import { TransmissionQueue } from './transmission-queue.js';
+import { DomainTagger } from './domain-tagger.js';
 import {
   CHUNK_TIMEOUT_MS,
   CENTRAL_COMMAND_URL,
@@ -33,7 +34,7 @@ export class TrajectoryCapture {
     this._contexts = new Map();
   }
 
-  init() {
+  async init() {
     if (!ConsentManager.isCaptureEnabled()) {
       this._enabled = false;
       return;
@@ -43,6 +44,8 @@ export class TrajectoryCapture {
     this._attestation = new SessionAttestation(this._centralCommandUrl);
     this._transmissionQueue = new TransmissionQueue(this._centralCommandUrl);
     this._transmissionQueue.start();
+    this._domainTagger = new DomainTagger();
+    await this._domainTagger.init();
     this._offlineRetryTimer = setInterval(() => {
       this._retryOfflineQueue();
     }, OFFLINE_RETRY_INTERVAL_MS);
@@ -126,10 +129,6 @@ export class TrajectoryCapture {
       if (resolved) ctx.metadata.model_engine = resolved;
     }
 
-    const tokens = ctx.parser.extractTokens(jsonEvent);
-    if (tokens) {
-      ctx.totalTokens += (tokens.input || 0) + (tokens.output || 0);
-    }
   }
 
   onUserMessage(agentId, text) {
@@ -198,6 +197,7 @@ export class TrajectoryCapture {
       ...ev,
     };
 
+    ctx.totalTokens += ev.token_count;
     if (ev.type === 'error') ctx.errorsEncountered++;
     ctx.allSteps.push(step);
 
@@ -254,6 +254,14 @@ export class TrajectoryCapture {
     const userInterventions = StepClassifier.countUserInterventions(ctx.allSteps);
     const durationSeconds = Math.round((Date.now() - ctx.startTime) / 1000);
 
+    if (this._domainTagger) {
+      const role = ctx.metadata.agent_role || '';
+      const firstPrompt = ctx.allSteps.find((s) => s.type === 'thought')?.content || '';
+      const thoughtSteps = ctx.allSteps.filter((s) => s.type === 'thought');
+      const routingText = DomainTagger.buildRoutingText(role, firstPrompt, thoughtSteps);
+      ctx.metadata.domain_tags = await this._domainTagger.tag(routingText);
+    }
+
     const { tier, reason: tierReason } = this._computeQualityTier(ctx, status, userInterventions);
     const { eligible, exclusionReason } = this._computeTrainingEligibility(ctx, durationSeconds);
 
@@ -296,8 +304,9 @@ export class TrajectoryCapture {
 
   _computeQualityTier(ctx, status, userInterventions) {
     const quality = ctx.metadata.session_quality;
-    if (quality >= TIER_A_MIN_QUALITY && ctx.errorsEncountered === 0 && userInterventions === 0 && status === 'SUCCESS') {
-      return { tier: 'TIER_A', reason: 'high_quality_no_errors' };
+    if (quality >= TIER_A_MIN_QUALITY && (ctx.errorsEncountered === 0 || ctx.errorsEncountered <= ctx.errorsRecovered) && userInterventions === 0 && status === 'SUCCESS') {
+      const reason = ctx.errorsEncountered > 0 ? 'high_quality_errors_recovered' : 'high_quality_no_errors';
+      return { tier: 'TIER_A', reason };
     }
     if (status !== 'SUCCESS') {
       return { tier: 'TIER_C', reason: 'non_success_status' };

package/moe-training/test/client/step-classifier.test.js

@@ -132,4 +132,46 @@ describe('StepClassifier', () => {
     assert.ok(result);
     assert.equal(result.type, 'action');
   });
+
+  it('preserves observation type when is_error is false despite error keywords', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'observation', content: 'Cannot find module foo', is_error: false };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'observation');
+  });
+
+  it('preserves observation type when is_error:false and content has TypeError', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'observation', content: 'TypeError: something failed', is_error: false };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'observation');
+  });
+
+  it('still reclassifies observation to error when is_error is true', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'observation', content: 'Command failed with exit code 1', is_error: true };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'error');
+  });
+
+  it('still reclassifies observation to error when is_error is undefined', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'observation', content: 'ENOENT: no such file or directory' };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'error');
+  });
+
+  it('preserves action type when is_error is false', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'action', content: 'Command failed with exit code 1', is_error: false };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'action');
+  });
+
+  it('still reclassifies action to error when is_error is not set', () => {
+    const classifier = new StepClassifier();
+    const step = { type: 'action', content: 'Command failed with exit code 1' };
+    const result = classifier.onStep(step);
+    assert.equal(result.type, 'error');
+  });
 });

package/moe-training/test/client/trajectory-capture.test.js

@@ -292,6 +292,101 @@ describe('TrajectoryCapture — user feedback emission', () => {
   });
 });
 
+describe('TrajectoryCapture — token counting via _processStep', () => {
+  it('accumulates token_count from every step type', () => {
+    const tc = makeTc();
+    tc._scrubber = { scrub: (s) => s };
+    const ctx = makeCtx();
+    ctx.totalTokens = 0;
+    ctx.stepCount = 0;
+    ctx.allSteps = [];
+    ctx.builder = { addStep: () => null };
+    ctx.classifier = {
+      onStep: (s) => s,
+    };
+
+    tc._processStep('agent-1', ctx, { type: 'thought', content: 'thinking about it', token_count: 50 });
+    tc._processStep('agent-1', ctx, { type: 'action', content: 'run test', token_count: 30 });
+    tc._processStep('agent-1', ctx, { type: 'observation', content: 'test passed', token_count: 100 });
+    tc._processStep('agent-1', ctx, { type: 'thought', content: 'next step', token_count: 20 });
+
+    assert.equal(ctx.totalTokens, 200);
+    assert.equal(ctx.stepCount, 4);
+  });
+
+  it('estimates token_count when not provided', () => {
+    const tc = makeTc();
+    tc._scrubber = { scrub: (s) => s };
+    const ctx = makeCtx();
+    ctx.totalTokens = 0;
+    ctx.stepCount = 0;
+    ctx.allSteps = [];
+    ctx.builder = { addStep: () => null };
+    ctx.classifier = {
+      onStep: (s) => s,
+    };
+
+    tc._processStep('agent-1', ctx, { type: 'thought', content: 'a'.repeat(100) });
+    assert.equal(ctx.totalTokens, 25);
+  });
+
+  it('does not double-count tokens from onStdoutLine', () => {
+    const tc = makeTc();
+    tc._scrubber = { scrub: (s) => s };
+    tc._enabled = true;
+
+    const ctx = makeCtx();
+    ctx.totalTokens = 0;
+    ctx.stepCount = 0;
+    ctx.allSteps = [];
+    ctx.builder = { addStep: () => null };
+    ctx.classifier = {
+      onStep: (s) => s,
+    };
+    ctx.parser = {
+      parseEvent: () => ({ type: 'thought', content: 'hello', token_count: 10 }),
+      extractModel: () => null,
+    };
+    tc._contexts.set('agent-x', ctx);
+
+    tc.onStdoutLine('agent-x', '{"type":"assistant"}');
+    assert.equal(ctx.totalTokens, 10);
+  });
+});
+
+describe('TrajectoryCapture — TIER_A with recovered errors', () => {
+  it('TIER_A when all errors are recovered', () => {
+    const tc = makeTc();
+    const ctx = makeCtx({ quality: 80, errorsEncountered: 2, errorsRecovered: 2 });
+    const result = tc._computeQualityTier(ctx, 'SUCCESS', 0);
+    assert.equal(result.tier, 'TIER_A');
+    assert.equal(result.reason, 'high_quality_errors_recovered');
+  });
+
+  it('TIER_A when errors recovered exceed errors encountered', () => {
+    const tc = makeTc();
+    const ctx = makeCtx({ quality: 75, errorsEncountered: 1, errorsRecovered: 2 });
+    const result = tc._computeQualityTier(ctx, 'SUCCESS', 0);
+    assert.equal(result.tier, 'TIER_A');
+    assert.equal(result.reason, 'high_quality_errors_recovered');
+  });
+
+  it('not TIER_A when errors exceed recoveries', () => {
+    const tc = makeTc();
+    const ctx = makeCtx({ quality: 80, errorsEncountered: 3, errorsRecovered: 1 });
+    const result = tc._computeQualityTier(ctx, 'SUCCESS', 0);
+    assert.notEqual(result.tier, 'TIER_A');
+  });
+
+  it('TIER_A with zero errors still uses original reason', () => {
+    const tc = makeTc();
+    const ctx = makeCtx({ quality: 80, errorsEncountered: 0 });
+    const result = tc._computeQualityTier(ctx, 'SUCCESS', 0);
+    assert.equal(result.tier, 'TIER_A');
+    assert.equal(result.reason, 'high_quality_no_errors');
+  });
+});
+
 describe('TrajectoryCapture — _computeQuality', () => {
   it('base score is 50', () => {
     const tc = makeTc();

package/node_modules/@groove-dev/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groove-dev/cli",
-  "version": "0.27.103",
+  "version": "0.27.104",
   "description": "GROOVE CLI — manage AI coding agents from your terminal",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

package/node_modules/@groove-dev/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groove-dev/daemon",
-  "version": "0.27.103",
+  "version": "0.27.104",
   "description": "GROOVE daemon — agent orchestration engine",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

package/node_modules/@groove-dev/daemon/src/api.js

@@ -758,9 +758,25 @@ export function createApi(app, daemon) {
 
           proc.on('close', (code) => {
             clearTimeout(timeout);
-            respond(code === 0
-              ? { status: 'authenticated' }
-              : { status: 'error', error: stderr.slice(-200) || `Login failed (exit ${code})` });
+            if (code === 0) {
+              let hasKey = false;
+              try {
+                const authPath = resolve(homedir(), '.codex', 'auth.json');
+                if (existsSync(authPath)) {
+                  const auth = JSON.parse(readFileSync(authPath, 'utf8'));
+                  const token = auth.OPENAI_API_KEY
+                    || (auth.auth_mode === 'chatgpt' && auth.tokens?.id_token)
+                    || null;
+                  if (token) {
+                    daemon.credentials.setKey('codex', token);
+                    hasKey = true;
+                  }
+                }
+              } catch { /* auth.json missing or malformed — login still succeeded */ }
+              respond({ status: 'authenticated', hasKey });
+            } else {
+              respond({ status: 'error', error: stderr.slice(-200) || `Login failed (exit ${code})` });
+            }
           });
 
           proc.on('error', (err) => {