@toddzheng024/dscode 0.1.0 → 0.2.0

package/cli.mjs

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import { readFileSync } from 'node:fs';
-import { run } from './manager.mjs';
+import { run, stateHome } from './manager.mjs';
+import { CLIENT_COMMANDS, runClient } from './session-bridge/client.mjs';
 const release = JSON.parse(readFileSync(new URL('./release.json', import.meta.url), 'utf8'));
 const args = process.argv.slice(2);
 if (args[0] === '--version') console.log(release.version);
-else if (args[0] === '--help' || args[0] === '-h') console.log(`DSCODE ${release.version}\n\n  dscode                         Start; first launch installs the Hub preset\n  dscode install [version]       Install an exact preset release\n  dscode update [version]        Upgrade (default: launcher release)\n  dscode history                 List retained preset revisions\n  dscode rollback [revision]     Restore a retained revision\n  dscode doctor                  Check the installed Hub profile\n  dscode --continue              Continue the previous session\n  dscode --resume SESSION_ID     Resume a session\n  dscode --cwd DIRECTORY         Work in a directory\n\nState: $DSCODE_HOME or ~/.local/share/dscode-hub\nModel credentials: configure /model in the TUI or set DEEPSEEK_API_KEY.`);
-else run(args, release).catch(error => { console.error(error.message); process.exitCode = 1; });
+else if (args[0] === '--help' || args[0] === '-h') console.log(`DSCODE ${release.version}\n\n  dscode                         Start; first launch installs the Hub preset\n  dscode install [version]       Install an exact preset release\n  dscode update [version]        Upgrade (default: launcher release)\n  dscode history                 List retained preset revisions\n  dscode rollback [revision]     Restore a retained revision\n  dscode doctor                  Check the installed Hub profile\n  dscode sessions               List running sessions\n  dscode send ID [--steer|--defer] TEXT  Send or leave a note\n    --title TITLE               Set the session title when sending\n  dscode read ID [--after SEQ]   Read an immutable event page\n  dscode watch ID [--after SEQ]  Subscribe to session events\n  dscode mailbox ID             Read messages and deferred notes\n  dscode watch-mailbox ID       Subscribe to mailbox events\n  dscode reply ID --reply-to REQUEST TEXT  Send a final reply\n  dscode cancel ID MESSAGE      Cancel a request or unclaimed message\n  dscode new-task ID            Explicitly reset communication budget while idle\n  dscode resume [SESSION_ID]     Resume a session (default: latest)\n  dscode --continue              Continue the previous session\n  dscode --resume SESSION_ID     Resume a session\n  dscode --cwd DIRECTORY         Work in a directory\n\nState: $DSCODE_HOME or ~/.local/share/dscode-hub\nModel credentials: configure /model in the TUI or set DEEPSEEK_API_KEY.`);
+else (CLIENT_COMMANDS.includes(args[0]) ? runClient(args, stateHome()) : run(args, release)).catch(error => { console.error(error.message); process.exitCode = 1; });

package/manager.mjs

@@ -26,6 +26,10 @@ export function acquireLock(home) {
 }
 export function commandPlan(args, release, installed) {
   const [command, ...rest] = args;
+  if (command === 'resume') {
+    const id = rest[0] && !rest[0].startsWith('-') ? rest.shift() : undefined;
+    return { launch: [...(id ? ['--resume', id] : ['--continue']), ...rest], install: !installed };
+  }
   const flags = ['--profile', 'dscode'];
   if (command === 'install' || command === 'update') {
     if (rest.length > 1 || rest[0] && !/^\d+\.\d+\.\d+(?:-[\w.-]+)?$/.test(rest[0])) throw Error('Usage: dscode install|update [exact-version]');
@@ -41,6 +45,38 @@ export function commandPlan(args, release, installed) {
   }
   return { launch: args, install: !installed };
 }
+// Recommendations are advisory. Resolve from the installed bundle (including
+// pnpm's nested graph), not from the launcher or a globally installed Harness.
+export function warnCompatibility(profile, release, metadata, warn = console.error) {
+  const differences = [];
+  if (metadata.version !== release.version) {
+    differences.push(`DSCODE bundle: installed ${metadata.version}, recommended ${release.version} for this launcher`);
+  }
+  const bundleRequire = createRequire(join(profile, 'node_modules', release.bundle, 'package.json'));
+  const expected = Object.fromEntries(Object.entries(metadata.dependencies ?? {}).filter(([name]) => name.startsWith('@deepseek-ai/')));
+  expected['@deepseek-ai/dsh'] ??= release.runtime;
+  for (const [name, version] of Object.entries(expected)) {
+    if (!version) continue;
+    try {
+      const path = bundleRequire.resolve(`${name}/package.json`);
+      const actual = JSON.parse(readFileSync(path, 'utf8')).version;
+      if (actual !== version) differences.push(`${name}: installed ${actual}, recommended ${version}`);
+    } catch {
+      differences.push(`${name}: version could not be checked; recommended ${version}`);
+    }
+  }
+  // This is the entry point actually executed below; it may differ from the
+  // bundle's resolution when a user overrides the profile's dependencies.
+  try {
+    const actual = JSON.parse(readFileSync(join(profile, 'node_modules/@deepseek-ai/dsh/package.json'), 'utf8')).version;
+    const version = expected['@deepseek-ai/dsh'];
+    if (version && actual !== version) differences.push(`Harness launch entry: installed ${actual}, recommended ${version}`);
+  } catch {
+    differences.push('Harness launch entry: version could not be checked');
+  }
+  if (differences.length) warn(`[DSCODE warning] This installation differs from the recommended version combination:\n${differences.map(line => `  ${line}`).join('\n')}\nContinuing without confirmation. Compatibility has not been verified for this combination.\n`);
+  return differences;
+}
 export async function run(args, release) {
   const home = stateHome();
   const envFile = join(home, '.env');
@@ -70,6 +106,7 @@ export async function run(args, release) {
     }
     const metadata = JSON.parse(readFileSync(join(profile,'node_modules',release.bundle,'package.json'),'utf8'));
     if (metadata.name !== release.bundle) throw Error('Unexpected DSCODE bundle');
+    warnCompatibility(profile, release, metadata);
     const dshPackage = join(profile, 'node_modules/@deepseek-ai/dsh/package.json');
     const dsh = join(dirname(dshPackage),'lib/bin.js');
     const overlays = ['mcp.local.yml','harness.local.yml'].flatMap(file => {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "license": "MIT",
   "author": "Todd Zheng",
@@ -22,7 +22,8 @@
     "cli.mjs",
     "manager.mjs",
     "release.json",
-    "tools"
+    "tools",
+    "session-bridge"
   ],
   "dependencies": {
     "@dsh-plugin-hub/cli": "0.2.0",

package/release.json

@@ -1,6 +1,6 @@
 {
   "slug": "dscode",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "runtime": "0.1.5-rc.1",
   "bundle": "@toddzheng024/dscode-bundle"
 }

package/session-bridge/client.mjs

@@ -0,0 +1,106 @@
+import { createConnection } from 'node:net';
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { socketDirectory } from './paths.mjs';
+
+export const CLIENT_COMMANDS = ['sessions', 'send', 'reply', 'read', 'watch', 'mailbox', 'watch-mailbox', 'cancel', 'new-task'];
+export async function* exchange(path, request, { signal } = {}) {
+  const socket = createConnection({ path });
+  socket.setEncoding('utf8');
+  socket.setTimeout(10000, () => socket.destroy(Error('DSCODE endpoint timed out')));
+  const abort = () => socket.destroy();
+  signal?.addEventListener('abort', abort, { once: true });
+  try {
+    signal?.throwIfAborted();
+    socket.write(JSON.stringify(request) + '\n');
+    let buffer = '';
+    for await (const chunk of socket) {
+      buffer += chunk;
+      if (Buffer.byteLength(buffer) > 16 * 1024 * 1024) throw Error('DSCODE response exceeds limit');
+      let index;
+      while ((index = buffer.indexOf('\n')) >= 0) {
+        const value = JSON.parse(buffer.slice(0, index)); buffer = buffer.slice(index + 1);
+        if (value.error) throw Object.assign(Error(value.error), { code: value.code });
+        if (value.type === 'ready') socket.setTimeout(0);
+        yield value;
+      }
+    }
+    if (buffer.trim()) throw Error('Incomplete DSCODE response; retry with the same requestId/cursor');
+  } finally { signal?.removeEventListener('abort', abort); socket.destroy(); }
+}
+export async function request(path, payload) {
+  for await (const value of exchange(path, payload)) return value.result;
+  throw Error('DSCODE connection closed before acknowledgement; retry with the same requestId');
+}
+export async function discover(home) {
+  let directory;
+  try { directory = socketDirectory(home); } catch (error) { if (error.code === 'ENOENT') return []; throw error; }
+  const endpoints = readdirSync(directory).filter(n => /^\d+-[a-f0-9]{8}\.sock$/.test(n));
+  const results = await Promise.all(endpoints.map(async name => {
+    const path = join(directory, name);
+    try { return (await request(path, { method: 'list' })).map(session => ({ ...session, socket: path })); }
+    catch (error) { if (['ECONNREFUSED', 'ENOENT'].includes(error.code)) return []; throw error; }
+  }));
+  return results.flat();
+}
+export function resolveSession(sessions, id) {
+  const exact = sessions.filter(s => s.id === id);
+  const matches = exact.length ? exact : sessions.filter(s => s.id.startsWith(id));
+  if (matches.length !== 1) throw Error(matches.length ? 'Ambiguous session; use its complete ID' : 'No active session found. Run dscode sessions or open the session in dscode first.');
+  return matches[0];
+}
+export function parseClientArgs(argv) {
+  const [command, ...args] = argv;
+  const result = { command, mode: 'queue', source: 'cli', after: command.includes('mailbox') ? 0 : -1, limit: 100, requestId: randomUUID() };
+  if (!CLIENT_COMMANDS.includes(command)) throw Error('Unknown session command');
+  if (command !== 'sessions') { result.sessionId = args.shift(); if (!result.sessionId || result.sessionId.startsWith('-')) throw Error(`Usage: dscode ${command} SESSION_ID`); }
+  const text = []; let modeSet = false;
+  while (args.length) {
+    const arg = args.shift();
+    if (arg === '--') { text.push(...args); break; }
+    if (['--steer', '--defer'].includes(arg) && ['send', 'reply'].includes(command)) {
+      if (modeSet) throw Error('Choose only one of --steer and --defer');
+      modeSet = true; result.mode = arg === '--steer' ? 'steer' : 'defer'; continue;
+    }
+    const names = { '--source': 'source', '--title': 'title', '--kind': 'kind', '--reply-to': 'inReplyTo', '--request-id': 'requestId', '--after': 'after', '--limit': 'limit', '--home': 'home' };
+    if (names[arg]) {
+      const allowed = arg === '--home' || command === 'send' && ['--source', '--title', '--request-id', '--kind'].includes(arg) || command === 'reply' && ['--reply-to', '--request-id'].includes(arg) || ['read', 'watch', 'mailbox', 'watch-mailbox'].includes(command) && arg === '--after' || ['read', 'mailbox'].includes(command) && arg === '--limit';
+      if (!allowed || !args.length) throw Error(`Invalid ${arg} option`);
+      const value = args.shift(); result[names[arg]] = ['--after', '--limit'].includes(arg) ? Number(value) : value;
+    } else if (arg.startsWith('-')) throw Error(`Unknown option ${arg}`);
+    else text.push(arg);
+  }
+  if (['send', 'reply'].includes(command)) { result.text = text.join(' '); if (!result.text.trim()) throw Error('Send requires message text'); }
+  else if (command === 'cancel' && text.length === 1) result.messageId = text[0];
+  else if (text.length) throw Error('Unexpected arguments');
+  if (command === 'reply' && !result.inReplyTo) throw Error('Reply requires --reply-to REQUEST_MESSAGE_ID');
+  if (command === 'cancel' && !result.messageId) throw Error('Cancel requires MESSAGE_ID');
+  if (result.kind && !['request', 'notify'].includes(result.kind)) throw Error('Kind must be request or notify');
+  return result;
+}
+export async function runClient(argv, defaultHome) {
+  const options = parseClientArgs(argv);
+  const sessions = await discover(options.home ?? defaultHome);
+  if (options.command === 'sessions') { console.log(JSON.stringify(sessions, null, 2)); return; }
+  const session = resolveSession(sessions, options.sessionId);
+  const payload = { method: options.command, sessionId: session.id, after: options.after, limit: options.limit,
+    text: options.text, title: options.title, mode: options.mode, source: options.source, requestId: options.requestId,
+    kind: options.kind, inReplyTo: options.inReplyTo, messageId: options.messageId };
+  if (!['watch', 'watch-mailbox'].includes(options.command)) {
+    // Print the identity before dispatch so even a lost ACK can be retried.
+    if (['send', 'reply'].includes(options.command)) process.stderr.write(`requestId: ${options.requestId}\n`);
+    console.log(JSON.stringify(await request(session.socket, payload), null, 2)); return;
+  }
+  const controller = new AbortController();
+  const abort = () => controller.abort(); process.once('SIGINT', abort);
+  let closed = false;
+  try {
+    for await (const value of exchange(session.socket, payload, { signal: controller.signal })) {
+      await new Promise((resolve, reject) => process.stdout.write(JSON.stringify(value) + '\n', error => error ? reject(error) : resolve()));
+      if (value.type === 'closed') closed = true;
+    }
+    if (!closed && !controller.signal.aborted) throw Error('Stream disconnected. Reconnect with --after set to the last received event seq.');
+  } catch (error) { if (!controller.signal.aborted) throw error; }
+  finally { process.off('SIGINT', abort); }
+}

package/session-bridge/paths.mjs

@@ -0,0 +1,21 @@
+import { createHash } from 'node:crypto';
+import { mkdirSync, lstatSync, realpathSync } from 'node:fs';
+import { resolve, join } from 'node:path';
+
+export function socketDirectory(home, create = false) {
+  let canonical = resolve(home);
+  try { canonical = realpathSync(canonical); } catch {}
+  const hash = createHash('sha256').update(canonical).digest('hex').slice(0, 20);
+  // macOS Unix socket paths have a small byte limit. Do not put them beneath
+  // potentially long workspace/profile paths. The directory is private per UID.
+  const path = join('/tmp', `dscode-${process.getuid()}-${hash}`);
+  if (create) { try { mkdirSync(path, { mode: 0o700 }); } catch (error) { if (error.code !== 'EEXIST') throw error; } }
+  const stat = lstatSync(path);
+  if (!stat.isDirectory() || stat.isSymbolicLink() || stat.uid !== process.getuid() || (stat.mode & 0o077)) throw Error('Unsafe DSCODE socket directory');
+  return path;
+}
+
+export function ensureSocketDirectory(home) {
+  try { return socketDirectory(home); }
+  catch (error) { if (error.code !== 'ENOENT') throw error; return socketDirectory(home, true); }
+}