@principles/pd-cli 1.152.0 → 1.152.2

package/tests/commands/console-open.test.ts

@@ -328,7 +328,9 @@ describe('planConsoleLaunch — reused (healthy console on preferred port)', ()
       expect(result.reason).toBe('console_authentication_mode_mismatch');
       // PRI-695: the guidance names the actual running state and both ways
       // out — it no longer references "Companion" (meaningless to CLI users)
-      // or PD_CONSOLE_TOKEN (never set by the default install).
+      // or PD_CONSOLE_TOKEN (never set by the default install). PRI-784: the
+      // no-source form stays source-neutral; the env/flag variants have
+      // their own cases below.
       expect(result.nextAction).toContain('without authentication');
       expect(result.nextAction).toContain(`port ${addr.port}`);
       expect(result.nextAction).not.toContain('Companion');
@@ -338,6 +340,56 @@ describe('planConsoleLaunch — reused (healthy console on preferred port)', ()
     }
   });
 
+  it('auth-mismatch guidance names PD_CONSOLE_TOKEN and its durable removal when the token came from the env (PRI-784)', async () => {
+    const server = http.createServer((_req, res) => {
+      res.statusCode = 200;
+      res.end(JSON.stringify({ success: true, data: { authenticationMode: 'no_auth' } }));
+    });
+    await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
+    const addr = server.address();
+    if (typeof addr !== 'object' || !addr) throw new Error('no addr');
+    try {
+      const result = await planConsoleLaunch({
+        workspaceDir: '/tmp/anywhere', preferredPort: addr.port,
+        host: '127.0.0.1', token: 'configured-token', tokenSource: 'env',
+      });
+      expect(result.status).toBe('refused');
+      expect(result.reason).toBe('console_authentication_mode_mismatch');
+      // The env source is the recurring real-world trap: a persistently set
+      // variable makes "reopen without a token" impossible to follow, so the
+      // guidance must name the variable and how to remove it at its source.
+      expect(result.nextAction).toContain('PD_CONSOLE_TOKEN');
+      expect(result.nextAction).toContain("SetEnvironmentVariable('PD_CONSOLE_TOKEN', $null, 'User')");
+      expect(result.nextAction).toContain('--no-auth');
+      expect(result.nextAction).toContain('--token');
+    } finally {
+      await new Promise<void>((resolve) => server.close(resolve));
+    }
+  });
+
+  it('auth-mismatch guidance names --token, never the env var, when the token came from the flag (PRI-784)', async () => {
+    const server = http.createServer((_req, res) => {
+      res.statusCode = 200;
+      res.end(JSON.stringify({ success: true, data: { authenticationMode: 'no_auth' } }));
+    });
+    await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
+    const addr = server.address();
+    if (typeof addr !== 'object' || !addr) throw new Error('no addr');
+    try {
+      const result = await planConsoleLaunch({
+        workspaceDir: '/tmp/anywhere', preferredPort: addr.port,
+        host: '127.0.0.1', token: 'configured-token', tokenSource: 'flag',
+      });
+      expect(result.status).toBe('refused');
+      expect(result.reason).toBe('console_authentication_mode_mismatch');
+      expect(result.nextAction).toContain('--token');
+      expect(result.nextAction).toContain('--no-auth');
+      expect(result.nextAction).not.toContain('PD_CONSOLE_TOKEN');
+    } finally {
+      await new Promise<void>((resolve) => server.close(resolve));
+    }
+  });
+
   it('reuses a no-auth Console for a tokenless caller (PRI-695 default post-install state)', async () => {
     // The installer auto-launches the Console with --no-auth; the documented
     // reopen command carries no flags and no token. That combination must
@@ -724,6 +776,12 @@ describe('CLI command wiring (pd console open)', () => {
       expect(run.parsed.status).toBe('refused');
       expect(run.parsed.reason).toBe('console_authentication_mode_mismatch');
       expect(run.parsed).not.toHaveProperty('serverPid');
+      // PRI-784 review fix (PR #1670): the fresh-start env guidance is part of
+      // the user contract — assert its content, not just the refusal shell.
+      expect(run.parsed.nextAction).toContain('PD_CONSOLE_TOKEN');
+      expect(run.parsed.nextAction).toContain('not forwarded');
+      expect(run.parsed.nextAction).toContain('--token "$PD_CONSOLE_TOKEN"');
+      expect(run.parsed.nextAction).toContain('--no-auth');
       await new Promise((resolve) => setTimeout(resolve, 100));
       expect(await isPortInUse('127.0.0.1', 49391)).toBe(false);
     } finally {

package/tests/commands/runtime-init-empty-workspace.test.ts

@@ -70,6 +70,8 @@ const EXPECTED_TRAJECTORY_TABLES = [
   'schema_version', 'ingest_checkpoint', 'sessions', 'assistant_turns',
   'user_turns', 'tool_calls', 'pain_events', 'gate_blocks', 'trust_changes',
   'principle_events', 'task_outcomes', 'correction_samples', 'sample_reviews',
+  // PRI-790 G2: Stage2 待确认信号的持久队列（observer 周期批量确认的输入）。
+  'signal_confirmations',
   'exports_audit',
 ];
 
@@ -83,6 +85,8 @@ const EXPECTED_TRAJECTORY_INDEXES = [
   'idx_pain_events_session_id',
   'idx_pain_events_canonical_pain_id',
   'idx_correction_samples_review_status',
+  // PRI-790 G2: 队列扫描索引（status + attempts）。
+  'idx_signal_confirmations_status',
 ];
 
 // ── Tests ───────────────────────────────────────────────────────────────────
@@ -121,7 +125,7 @@ describe('pd runtime init — empty workspace integration', () => {
       }
     });
 
-    it('creates trajectory.db with all 14 expected tables', () => {
+    it('creates trajectory.db with all 15 expected tables', () => {
       buildRuntimeInitOutput(tmpDir, true);
       const trajDbPath = path.join(tmpDir, '.state', 'trajectory.db');
       expect(fs.existsSync(trajDbPath)).toBe(true);

package/tests/services/config-doctor-signal-health.test.ts

@@ -0,0 +1,109 @@
+/**
+ * PRI-788 G4 — pd config doctor 的 signalHealth 分级测试。
+ */
+import { afterEach, describe, expect, it } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+import { buildSignalHealthEntry } from '../../src/services/config-doctor.js';
+
+const tempDirs: string[] = [];
+
+afterEach(() => {
+  for (const dir of tempDirs.splice(0)) {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+function makeStateDir(): string {
+  const workspace = fs.mkdtempSync(path.join(os.tmpdir(), 'pd-doctor-signal-'));
+  const stateDir = path.join(workspace, '.state');
+  fs.mkdirSync(stateDir, { recursive: true });
+  tempDirs.push(workspace);
+  return stateDir;
+}
+
+function writeHealth(stateDir: string, state: Record<string, unknown>): void {
+  fs.writeFileSync(path.join(stateDir, 'signal-health.json'), JSON.stringify({
+    stage1Strong: 0,
+    stage2Confirmed: 0,
+    stage2Queued: 0,
+    stage2Dropped: 0,
+    pendingCount: 0,
+    lastStage2SuccessAt: null,
+    observerLastSuccessAt: null,
+    observerConsecutiveFailures: 0,
+    day: new Date().toISOString().slice(0, 10),
+    updatedAt: new Date().toISOString(),
+    ...state,
+  }));
+}
+
+describe('buildSignalHealthEntry (PRI-788 G4)', () => {
+  it('missing file → unknown with nextAction, never throws (rc-1)', () => {
+    const entry = buildSignalHealthEntry(makeStateDir());
+    expect(entry.status).toBe('unknown');
+    expect(entry.counts).toBeNull();
+    expect(entry.nextAction).toMatch(/signal_collector/);
+  });
+
+  it('corrupt file → unknown', () => {
+    const stateDir = makeStateDir();
+    fs.writeFileSync(path.join(stateDir, 'signal-health.json'), '{not-json');
+    expect(buildSignalHealthEntry(stateDir).status).toBe('unknown');
+  });
+
+  it('fresh healthy file → ok with counts', () => {
+    const stateDir = makeStateDir();
+    writeHealth(stateDir, { stage1Strong: 3, pendingCount: 2 });
+    const entry = buildSignalHealthEntry(stateDir);
+    expect(entry.status).toBe('ok');
+    expect(entry.counts).toMatchObject({ stage1Strong: 3, pendingCount: 2 });
+    expect(entry.observerConsecutiveFailures).toBe(0);
+  });
+
+  it('observerConsecutiveFailures > 4 → degraded with probe nextAction', () => {
+    const stateDir = makeStateDir();
+    writeHealth(stateDir, { observerConsecutiveFailures: 40 });
+    const entry = buildSignalHealthEntry(stateDir);
+    expect(entry.status).toBe('degraded');
+    expect(entry.reason).toContain('40 cycles');
+    expect(entry.nextAction).toContain('pd runtime probe');
+  });
+
+  it('stale updatedAt (>24h) → degraded', () => {
+    const stateDir = makeStateDir();
+    const stale = new Date(Date.now() - 30 * 60 * 60 * 1000).toISOString();
+    writeHealth(stateDir, { updatedAt: stale });
+    const entry = buildSignalHealthEntry(stateDir);
+    expect(entry.status).toBe('degraded');
+    expect(entry.reason).toContain('>24h');
+  });
+
+  it('恰好超过 24h（24.5h）即 degraded — 常量必须与「>24h」契约一致', () => {
+    const stateDir = makeStateDir();
+    const stale = new Date(Date.now() - 24.5 * 60 * 60 * 1000).toISOString();
+    writeHealth(stateDir, { updatedAt: stale });
+    expect(buildSignalHealthEntry(stateDir).status).toBe('degraded');
+  });
+
+  it('23h 未更新仍是 ok（不误报 degraded）', () => {
+    const stateDir = makeStateDir();
+    const fresh = new Date(Date.now() - 23 * 60 * 60 * 1000).toISOString();
+    writeHealth(stateDir, { updatedAt: fresh });
+    expect(buildSignalHealthEntry(stateDir).status).toBe('ok');
+  });
+
+  it('non-finite garbage fields degrade gracefully without throwing (rc-2)', () => {
+    const stateDir = makeStateDir();
+    writeHealth(stateDir, {
+      stage1Strong: 'lots',
+      observerConsecutiveFailures: 'many',
+      updatedAt: 12345,
+    });
+    const entry = buildSignalHealthEntry(stateDir);
+    expect(entry.status).toBe('degraded'); // updatedAt 非法 → stale 分支
+    expect(entry.counts?.stage1Strong).toBe(0);
+  });
+});