cc-viewer 1.7.23 → 1.8.0

package/server/lib/prefs-store.js

@@ -3,7 +3,7 @@
 // preferences.json holds UI prefs AND the (base64) LAN password (auth) AND per-project
 // forks (prefsByProject). Multiple writers touch it — the global POST /api/preferences,
 // lib/auth.js, and the new project-prefs routes — so every write here goes through ONE
-// async file lock + atomic tmp→rename, mirroring server/lib/ask-store.js. Same-process
+// async file lock + atomic tmp→rename, mirroring server/lib/ask/ask-store.js. Same-process
 // callers serialize via withFileLockAsync's per-lockPath Promise chain; cross-process
 // callers mutex on the lock file. This prevents a concurrent writer from clobbering the
 // password-bearing file or losing a fork update.
@@ -12,7 +12,7 @@ import { join, dirname } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { renameSyncWithRetry } from './file-api.js';
 import { withFileLockAsync } from './async-file-lock.js';
-import { mergeApprovalModalPrefs } from './approval-modal-prefs.js';
+import { mergeApprovalModalPrefs } from '@ccv/core/approval-modal-prefs';
 import { reconcileVoicePackPrefs } from './voice-pack-manager.js';
 import { LOG_DIR } from '../../findcc.js';
 

package/server/lib/project-prefs.js

@@ -9,9 +9,9 @@
 // A project "has a fork" iff a key exists for it (hasOwnProperty). Removing a fork
 // (toggle off) deletes the key so the project inherits global again.
 import { basename } from 'node:path';
-import { mergeApprovalModalPrefs } from './approval-modal-prefs.js';
-import { listPlatforms } from './im-config.js';
-import { _projectName } from '../interceptor.js';
+import { mergeApprovalModalPrefs } from '@ccv/core/approval-modal-prefs';
+import { listPlatforms } from './im/im-config.js';
+import { getProjectName } from './project-state.js';
 
 // SINGLE SOURCE of "what must never live inside a fork": secrets (auth password + IM creds),
 // machine-level paths (logDir/claudeConfigDir), and the internal forks map. snapshotForFork /
@@ -33,17 +33,17 @@ export function getCurrentProjectKey() {
 
 /** Human-readable project name for display (interceptor's sanitized basename). */
 export function getCurrentProjectName() {
-  return _projectName || basename(getCurrentProjectKey());
+  return getProjectName() || basename(getCurrentProjectKey());
 }
 
 /**
  * Whether the server is currently serving a concrete project. In workspace mode the
- * project is unknown until a workspace is launched (interceptor _projectName / env are
+ * project is unknown until a workspace is launched (project-state name / env are
  * empty) — refuse to fork under the server's own cwd in that window.
  */
 export function hasActiveProject() {
   if (process.env.CCV_WORKSPACE_MODE === '1') {
-    return !!(process.env.CCV_PROJECT_DIR || _projectName);
+    return !!(process.env.CCV_PROJECT_DIR || getProjectName());
   }
   return true;
 }

package/server/lib/project-state.js

@@ -0,0 +1,15 @@
+// Mutable "current project name" state — shared leaf (same pattern as findcc's
+// LOG_DIR). server/interceptor.js owns the value and pushes it at every rebind
+// (module init, initForWorkspace, resetWorkspace); lib readers such as
+// project-prefs.js must not import the interceptor (a stateful L2 module), so
+// they read through this leaf instead.
+
+let _currentProjectName = '';
+
+export function getProjectName() {
+  return _currentProjectName;
+}
+
+export function setProjectName(name) {
+  _currentProjectName = typeof name === 'string' ? name : '';
+}

package/server/lib/{proxy-retry.js → proxy/proxy-retry.js}

@@ -15,9 +15,9 @@
 //   - Streaming responses: only read status + headers to decide whether to retry; never retry after the body has
 //     started being sent (retry-before-first-byte strategy).
 //   - race/stagger use AbortController; cancelled requests must be released correctly.
-import { resolveProfileModel } from './interceptor-core.js';
+import { resolveProfileModel } from '../interceptor-core.js';
 import { readFileSync, existsSync } from 'node:fs';
-import { reportSwallowed } from './error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 // ── Configuration ─────────────────────────────────────────────────
 

package/server/lib/{proxy-stats.js → proxy/proxy-stats.js}

@@ -8,8 +8,8 @@
 //   - Fully separated from cc-viewer's existing session logs (*.jsonl written by interceptor), no cross-contamination.
 import { mkdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { AsyncWriteQueue } from './async-write-queue.js';
-import { reportSwallowed } from './error-report.js';
+import { AsyncWriteQueue } from '../async-write-queue.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 // ── Detail record schema ──────────────────────────────────────────────
 // Appends one JSON line after each proxied LLM API request completes. Fields align with llm-retry-proxy's retry records.
@@ -136,7 +136,7 @@ export function flushRecords() {
 }
 
 // ── Stats-update notifier (dependency inversion, review P2) ────────────────
-// proxy.js used to dynamically import('./server.js') to reach the statsWorker
+// proxy.js used to dynamically import('../server.js') to reach the statsWorker
 // singleton — if a future proxy-only process did that first, server.js's
 // module-load side effects would boot a second viewer. The owner (server.js)
 // now registers its notify callback here at load time; proxy.js just emits.

package/server/lib/sdk-adapter.js

@@ -1,81 +1,13 @@
 /**
- * sdk-adapter.js — Convert Agent SDK messages to JSONL entry format.
+ * sdk-adapter.js — SDK-mode approval helpers.
  *
- * The frontend expects entries shaped like intercepted Claude API request/response pairs.
- * This adapter converts SDKAssistantMessage objects into that format so the
- * existing SSE pipeline and ChatView rendering work unchanged.
+ * NOTE: SDK-mode display entries are no longer synthesized here. The SDK child
+ * process talks to the API through cc-viewer's loopback proxy, so entries reach
+ * the frontend via the same wire path as PTY mode (fetch hook → V2Writer →
+ * live-feed → SSE). Only the approval-close mapping below remains in use
+ * (server.js interruptTurn fan-out).
  */
 
-// Minimal tool stubs — only used as fallback if SDK doesn't provide real tools
-const STUB_TOOLS = [
-  { name: 'Bash' }, { name: 'Edit' }, { name: 'Read' },
-  { name: 'Write' }, { name: 'Glob' }, { name: 'Agent' },
-];
-
-/**
- * Convert an SDK assistant message + accumulated conversation into a JSONL entry.
- *
- * @param {object} assistantMsg — SDKAssistantMessage (has .message: BetaMessage)
- * @param {Array} messages — Accumulated conversation messages [{role, content}]
- * @param {string} model — Model name
- * @param {string} projectName — Project name
- * @param {object} [opts] — Additional options
- * @param {string} [opts.timestamp] — Stable timestamp for dedup (same per turn)
- * @param {boolean} [opts.inProgress] — Whether response is still streaming
- * @param {string} [opts.requestId] — Request ID for in-progress entries
- * @param {Array} [opts.tools] — Real tools list from SDK init message
- * @returns {object} JSONL entry compatible with frontend expectations
- */
-export function sdkToJSONLEntry(assistantMsg, messages, model, projectName, opts = {}) {
-  const respBody = assistantMsg?.message || null;
-  const entry = {
-    timestamp: opts.timestamp || new Date().toISOString(),
-    project: projectName || 'sdk',
-    url: 'https://api.anthropic.com/v1/messages?beta=true',
-    method: 'POST',
-    headers: {},
-    body: {
-      model: model || respBody?.model || 'claude-opus-4-6',
-      system: [{ type: 'text', text: 'You are Claude Code' }],
-      tools: opts.tools || STUB_TOOLS,
-      messages: messages || [],
-      metadata: {},
-    },
-    response: opts.inProgress ? null : {
-      status: 200,
-      statusText: 'OK',
-      headers: {},
-      body: respBody,
-    },
-    duration: 0,
-    isStream: false,
-    mainAgent: true,
-  };
-
-  if (opts.inProgress) {
-    entry.inProgress = true;
-    entry.requestId = opts.requestId || `sdk_${Date.now()}`;
-  }
-
-  return entry;
-}
-
-/**
- * Build a streaming status event payload.
- */
-export function buildStreamingStatus(active, meta = {}) {
-  if (active) {
-    return {
-      active: true,
-      model: meta.model || null,
-      startTime: meta.startTime || Date.now(),
-      bytesReceived: 0,
-      chunksReceived: 0,
-    };
-  }
-  return { active: false };
-}
-
 /**
  * Map an SDK approval `kind` to the WS broadcast message type that closes that
  * kind's modal on every client. Used when interruptTurn() drains pending approvals