cc-viewer 1.7.23 → 1.8.1

package/server/lib/v2/live-feed.js

@@ -24,15 +24,15 @@
 
 import { watch, existsSync, readdirSync, readFileSync, statSync, openSync, readSync, closeSync } from 'node:fs';
 import { join } from 'node:path';
-import { reportSwallowed } from '../error-report.js';
-import { createIncrementalReconstructor } from '../delta-reconstructor.js';
+import { reportSwallowed } from '@ccv/core/error-report';
+import { createIncrementalReconstructor } from '@ccv/core/delta-reconstructor';
 import { processWatchedEntry, sendEventToClients, sendEventRawToClients } from '../log-watcher.js';
 import { SessionSynthesizer } from './adapter.js';
 import { isDiscardableSession } from './session-select.js';
 import { isForeignLiveOwned } from './session-owner.js';
 import { isConvertRunning } from './convert-manager.js';
 import { computeCacheLoss } from './meta-rows.js';
-import { classifyRequest, withAgentNameSubType } from '../../../src/utils/requestType.js';
+import { classifyRequest, withAgentNameSubType } from '@ccv/core/requestType';
 
 const FSWATCH_DEBOUNCE_MS = 80;
 const SAFETY_POLL_MS = 5000;

package/server/lib/v2/meta-rows.js

@@ -7,7 +7,7 @@
  * dropped — the wire carries rows only (~1.3KB each vs full entries).
  *
  * Two DELIBERATE classification divergences from the legacy full-entry list
- * (both more correct; pinned in test/v2-meta-rows.test.js, declared in
+ * (both more correct; pinned in packages/app/test/v2-meta-rows.test.js, declared in
  * history.md):
  *  - membership is the journal fold — a SUPERSET of the synthesizer's output
  *    (conv-gapped crash-orphans get a row; their detail fetch answers 404 and
@@ -21,8 +21,8 @@ import { readJsonlTolerant } from './replay.js';
 import { iterateJsonlLines } from './jsonl-read.js';
 import { iterateV2Items, findTeammateSessionDirs } from './adapter.js';
 import { SingleFlight } from './singleflight.js';
-import { reportSwallowed } from '../error-report.js';
-import { classifyRequest, withAgentNameSubType } from '../../../src/utils/requestType.js';
+import { reportSwallowed } from '@ccv/core/error-report';
+import { classifyRequest, withAgentNameSubType } from '@ccv/core/requestType';
 
 // KEEP IN SYNC: server/lib/v2/adapter.js itemKey — (sessionId, seq) identity.
 const itemKey = (sessionId, seq) => `${sessionId}\x00${seq}`;

package/server/lib/v2/replay.js

@@ -12,7 +12,7 @@
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { createHash } from 'node:crypto';
-import { messageFingerprint, normalizeMsgForEquality } from '../session-boundary.js';
+import { messageFingerprint, normalizeMsgForEquality } from '@ccv/core/session-boundary';
 import { isSupportedWireFormat } from './layout.js';
 import { iterateJsonlLines } from './jsonl-read.js';
 

package/server/lib/v2/session-list.js

@@ -26,7 +26,7 @@ import { listSessionIds, readJsonlTolerant } from './replay.js';
 import { readPromptsHead, collectPromptsFromEvents } from '../user-prompt-extract.js';
 import { isDiscardableSession } from './session-select.js';
 import { isSupportedWireFormat, dirSizeSync } from './layout.js';
-import { reportSwallowed } from '../error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 const MAX_PROJECTS = 32;
 

package/server/lib/v2/session-owner.js

@@ -26,7 +26,7 @@
 import { readFileSync, writeFileSync, unlinkSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { isPidAlive } from '../pid-alive.js';
-import { reportSwallowed } from '../error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 export const OWNER_LOCK_NAME = 'owner.lock';
 

package/server/lib/v2/v2-writer.js

@@ -19,7 +19,7 @@
 import { statfsSync, existsSync, readdirSync, readFileSync } from 'node:fs';
 import { join, basename } from 'node:path';
 import { AsyncWriteQueue } from '../async-write-queue.js';
-import { reportSwallowed } from '../error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { ensureSessionDirSync, compactLocalTs14, sanitizePathComponent } from './layout.js';
 import { resolveSessionDirName, latestMainSession } from './session-select.js';
 import { acquireSessionClaim, releaseSessionClaim, isForeignLiveOwned } from './session-owner.js';
@@ -29,6 +29,7 @@ import { ConversationStore } from './conversation-store.js';
 import { parseUserId, classifyKind, ConvResolver } from './identity.js';
 import { parseAgentId, findHeader } from './agent-id.js';
 import { extractUserTexts, flattenPromptText, isSuggestionMode, readPromptsHead } from '../user-prompt-extract.js';
+import { consumePendingForWireByKey, writeSnapshotByKey, systemTextOfBody } from '../system-prompt-snapshots.js';
 
 // Below this many free bytes on the log volume, v2 skips writing and reports
 // once — logging must not be the thing that fills the disk (plan risk #9).
@@ -428,6 +429,30 @@ export class V2Writer {
       // (live ≈ now; convert = the historical first-entry ts).
       const s = this._session(sid, parsed && entry.body.metadata.user_id, parsed && parsed.encoding, project, entry.timestamp, adoptTarget);
 
+      // System-prompt snapshot, Bind A (wire): the FIRST main request of a session
+      // carries the launch's rendered injection in body.system — match it against the
+      // project's pending queue and key the snapshot to the wire sid (== transcript
+      // uuid for fresh sessions), so a later `-c`/`-r` can pin byte-identical content
+      // instead of re-rendering variables and busting the prompt-prefix cache.
+      // count_tokens/heartbeat probes wear main-agent shapes but aren't the user's
+      // turn (same gate as the resume-switch above); adopted (-c) sessions skip —
+      // their pendings are resumeExpected, reserved for the SessionStart-hook bind.
+      // First-main-only via the per-session flag: probes may create the session state
+      // before the real turn arrives. The live-sessions-dir gate keeps the offline
+      // converter (staging dirs) from consuming LIVE pendings. Fully caught: a lost
+      // bind degrades to the no-record resume path, never to a dropped log entry.
+      if (!adoptTarget && entry.mainAgent && !entry.isCountTokens && !entry.isHeartbeat
+        && this._sessionsDirName === 'sessions'
+        && s && !s.sysPromptBindDone) {
+        s.sysPromptBindDone = true;
+        try {
+          const pend = consumePendingForWireByKey(project, systemTextOfBody(entry.body), this._logDir);
+          if (pend) {
+            writeSnapshotByKey(project, sid, { entries: pend.entries, model: pend.model, boundVia: 'wire' }, { logDir: this._logDir });
+          }
+        } catch (err) { reportSwallowed('v2-write.sys-prompt-bind', err); }
+      }
+
       // Flush requests that arrived before the first sid (they belong here).
       // Their handles are parked in _lateHandles so a completion that arrives
       // after the flush still gets its done line (folded by rid).

package/server/lib/v2/verify.js

@@ -28,7 +28,7 @@
 import { statSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { iterateRawEntriesAsync } from '../log-stream.js';
-import { createIncrementalReconstructor } from '../delta-reconstructor.js';
+import { createIncrementalReconstructor } from '@ccv/core/delta-reconstructor';
 import { listSessionIds, readSession, indexSession, messagesDigest, blobRefOf } from './replay.js';
 
 const MAX_REPORTED_DIFFS = 50;

package/server/lib/voice-pack-manager.js

@@ -11,7 +11,7 @@
 import { existsSync, mkdirSync, writeFileSync, unlinkSync, readdirSync, statSync, readFileSync, lstatSync } from 'node:fs';
 import { join, extname } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { EVENT_KEYS, DEFAULT_BINDINGS, BUNDLED_PACK_IDS } from './voice-pack-events.js';
+import { EVENT_KEYS, DEFAULT_BINDINGS, BUNDLED_PACK_IDS } from '@ccv/core/voice-pack-events';
 import { DIST_DIR, PUBLIC_DIR } from '../_paths.js';
 
 // Bundled pack lookup order, per packId:
@@ -35,7 +35,7 @@ for (const packId of BUNDLED_PACK_IDS) {
   }
 }
 
-export { EVENT_KEYS } from './voice-pack-events.js';
+export { EVENT_KEYS } from '@ccv/core/voice-pack-events';
 export const ID_PATTERN = /^[a-f0-9-]{8,64}$/;
 export const ALLOWED_EXTS = new Set(['.mp3', '.wav', '.ogg', '.m4a']);
 export const MAX_AUDIO_BYTES = 2 * 1024 * 1024; // 2MB per file
@@ -334,6 +334,5 @@ export function reconcileVoicePackPrefs(logDir, vp) {
 // Re-export shared defaults so consumers can pull everything from one module.
 export { DEFAULT_BINDINGS, BUNDLED_PACK_IDS };
 
-// mergeApprovalModalPrefs / mergeVoicePackInto moved to server/lib/approval-modal-prefs.js
-//( — merge logic isn't voice-pack-specific). Import from
-// './approval-modal-prefs.js' directly.
+// mergeApprovalModalPrefs / mergeVoicePackInto moved to @ccv/core/approval-modal-prefs
+// (merge logic isn't voice-pack-specific). Import from '@ccv/core/approval-modal-prefs' directly.

package/server/lib/wire-compress.js

@@ -19,7 +19,7 @@
  * knee on large sessions; q5 collapses to ~2.5x there).
  */
 import zlib from 'node:zlib';
-import { reportSwallowed } from './error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { awaitDrainOrClose } from './sse-backpressure.js';
 
 const C = zlib.constants;

package/server/proxy.js

@@ -5,13 +5,13 @@ import { join, basename } from 'node:path';
 import { homedir } from 'node:os';
 import * as interceptor from './interceptor.js';
 import { setupInterceptor } from './interceptor.js';
-import { extractApiErrorMessage, formatProxyRequestError } from './lib/proxy-errors.js';
-import { getProxyDispatcher } from './lib/proxy-env.js';
+import { extractApiErrorMessage, formatProxyRequestError } from './lib/proxy/proxy-errors.js';
+import { getProxyDispatcher } from './lib/proxy/proxy-env.js';
 import { getClaudeConfigDir } from '../findcc.js';
 import { isAnthropicApiPath, classifyProxyRole } from './lib/interceptor-core.js';
-import { executeRequest, extractModel } from './lib/proxy-retry.js';
-import { buildRecord, appendRecord, dailyFilePath, todayStr, emitProxyStatsUpdate } from './lib/proxy-stats.js';
-import { reportSwallowed } from './lib/error-report.js';
+import { executeRequest, extractModel } from './lib/proxy/proxy-retry.js';
+import { buildRecord, appendRecord, dailyFilePath, todayStr, emitProxyStatsUpdate } from './lib/proxy/proxy-stats.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { LOG_DIR } from '../findcc.js';
 
 // Setup interceptor to patch fetch