draftgo-cli 3.0.48 → 3.0.51

package/src/worktree/index.js

@@ -15,7 +15,14 @@ const {
   resourceFileName,
   safeIdSegment,
 } = require('./types');
-const { streamToFiles, hashFile, copyFileAtomic, writeJsonAtomic, normalizeSha256 } = require('./streams');
+const {
+  streamToFiles,
+  hashFile,
+  copyFileAtomic,
+  writeJsonAtomic,
+  normalizeSha256,
+  tempPathFor,
+} = require('./streams');
 const {
   loadManifest,
   getEntry,
@@ -24,6 +31,7 @@ const {
   saveManifest,
 } = require('./manifest');
 const { validateContentFile } = require('./validate');
+const { inspectEntry, openMetadataSession, sameVersion } = require('./status');
 
 const CONFLICT_SCHEMA_VERSION = 1;
 
@@ -248,36 +256,148 @@ async function commitResources(projectDir, resourceType, resourceIds, options =
   const session = await createSession(config, options);
   const manifest = loadManifest(projectDir);
   const results = [];
+  const plans = [];
+  const preflightFailures = [];
+
+  const report = (result) => {
+    results.push(result);
+    if (typeof options.onStatus === 'function') options.onStatus(result);
+  };
 
+  // Resolve and validate every target before the first remote write. This prevents
+  // a late local or stale-version error from causing an avoidable partial batch.
   for (const resourceId of ids) {
-    const entry = getEntry(manifest, canonical, resourceId);
-    if (!entry) {
-      throw new WorktreeError('RESOURCE_NOT_CHECKED_OUT', `${canonical} ${resourceId} is not checked out.`);
-    }
-    if (entry.server !== config.server) {
-      throw new WorktreeError('CHECKOUT_SERVER_MISMATCH', 'Checkout belongs to a different DraftGo server.');
+    try {
+      const entry = getEntry(manifest, canonical, resourceId);
+      if (!entry) {
+        throw new WorktreeError('RESOURCE_NOT_CHECKED_OUT', `${canonical} ${resourceId} is not checked out.`);
+      }
+      if (entry.server !== config.server) {
+        throw new WorktreeError('CHECKOUT_SERVER_MISMATCH', 'Checkout belongs to a different DraftGo server.');
+      }
+      if (unresolvedConflict(projectDir, canonical, resourceId)) {
+        throw new WorktreeError(
+          'UNRESOLVED_CONFLICT',
+          `${canonical} ${resourceId} has an unresolved conflict; resolve it before committing.`,
+        );
+      }
+
+      const localPath = absolutePath(projectDir, entry.local_path);
+      const current = await hashFile(localPath);
+      const basePath = absolutePath(projectDir, entry.base_path);
+      const base = await hashFile(basePath);
+      if (base.hash !== entry.base_hash) {
+        throw new WorktreeError(
+          'BASE_HASH_MISMATCH',
+          `${canonical} ${resourceId} base hash differs from its manifest; run draftgo check --remote.`,
+          { manifest_hash: entry.base_hash, base_hash: base.hash },
+        );
+      }
+      if (current.hash !== entry.base_hash) validateContentFile(localPath, entry.content_type);
+
+      const fresh = await backend.resolveMetadata(config, canonical, resourceId, {
+        ...options,
+        ...session,
+        clientInitialized: true,
+      });
+      assertMetadataIdentity(fresh, canonical, resourceId);
+      const remoteMatchesBase = fresh.content_hash === entry.base_hash && sameVersion(entry, fresh);
+      if (!remoteMatchesBase) {
+        const state = await inspectEntry(projectDir, entry, fresh);
+        throw new WorktreeError(
+          state.local_matches_remote ? 'COMMITTED_UNRECORDED' : 'REMOTE_VERSION_CHANGED',
+          state.local_matches_remote
+            ? `${canonical} ${resourceId} already equals remote; run ${state.recommendation}.`
+            : `${canonical} ${resourceId} changed remotely; inspect with draftgo check --remote before committing.`,
+          state,
+        );
+      }
+      plans.push({ resourceId, entry, localPath, current, fresh });
+    } catch (error) {
+      if (error.code === 'REMOTE_VERSION_CHANGED') {
+        const entry = getEntry(manifest, canonical, resourceId);
+        try {
+          const conflict = await writeConflict(projectDir, entry, error, config, backend, options, session);
+          error = new WorktreeError(
+            'RESOURCE_VERSION_CONFLICT',
+            `${canonical} ${resourceId} changed remotely; conflict materials were preserved during preflight.`,
+            conflict,
+          );
+        } catch (conflictError) {
+          error = conflictError;
+        }
+      }
+      preflightFailures.push({
+        resource_type: canonical,
+        resource_id: resourceId,
+        status: 'failed',
+        phase: 'preflight',
+        code: error.code || 'PREFLIGHT_FAILED',
+        message: error.message,
+        details: error.details || {},
+      });
     }
-    if (unresolvedConflict(projectDir, canonical, resourceId)) {
-      throw new WorktreeError(
-        'UNRESOLVED_CONFLICT',
-        `${canonical} ${resourceId} has an unresolved conflict; resolve it before committing.`,
+  }
+
+  if (preflightFailures.length) {
+    const failedIds = new Set(preflightFailures.map((item) => String(item.resource_id)));
+    const notStarted = ids.filter((id) => !failedIds.has(String(id))).map((resourceId) => ({
+      resource_type: canonical,
+      resource_id: resourceId,
+      status: 'not_started',
+      phase: 'preflight',
+    }));
+    for (const result of [...preflightFailures, ...notStarted]) report(result);
+    if (ids.length === 1 && preflightFailures.length === 1) {
+      const original = new WorktreeError(
+        preflightFailures[0].code,
+        preflightFailures[0].message,
+        preflightFailures[0].details,
       );
+      throw original;
     }
+    throw new WorktreeError(
+      'BATCH_PREFLIGHT_FAILED',
+      `Commit preflight failed for ${preflightFailures.length} resource(s); no remote content was changed.`,
+      { completed: [], failed: preflightFailures, not_started: notStarted },
+    );
+  }
 
-    const localPath = absolutePath(projectDir, entry.local_path);
-    const current = await hashFile(localPath);
+  function throwBatchFailure(error, index, resourceId, remoteChangePossible = false) {
+    const failed = {
+      resource_type: canonical,
+      resource_id: resourceId,
+      status: 'failed',
+      phase: 'upload',
+      code: error.code || 'COMMIT_FAILED',
+      message: error.message,
+      remote_change_possible: remoteChangePossible,
+    };
+    const notStarted = plans.slice(index + 1).map((plan) => ({
+      resource_type: canonical,
+      resource_id: plan.resourceId,
+      status: 'not_started',
+      phase: 'upload',
+    }));
+    report(failed);
+    for (const item of notStarted) report(item);
+    error.details = {
+      ...(error.details || {}),
+      batch: {
+        completed: results.filter((item) => ['committed', 'unchanged'].includes(item.status)),
+        failed: [failed],
+        not_started: notStarted,
+      },
+    };
+    throw error;
+  }
+
+  for (let index = 0; index < plans.length; index += 1) {
+    const { resourceId, entry, localPath, current, fresh } = plans[index];
     if (current.hash === entry.base_hash) {
-      results.push({ resource_type: canonical, resource_id: resourceId, status: 'unchanged', hash: current.hash });
+      report({ resource_type: canonical, resource_id: resourceId, status: 'unchanged', hash: current.hash });
       continue;
     }
-    validateContentFile(localPath, entry.content_type);
-
-    const fresh = await backend.resolveMetadata(config, canonical, resourceId, {
-      ...options,
-      ...session,
-      clientInitialized: true,
-    });
-    assertMetadataIdentity(fresh, canonical, resourceId);
     const commitMetadata = {
       ...fresh,
       content_type: entry.content_type,
@@ -290,55 +410,147 @@ async function commitResources(projectDir, resourceType, resourceIds, options =
     try {
       responsePayload = await backend.commit(config, commitMetadata, localPath, current, options);
     } catch (error) {
-      if (!isVersionConflict(error)) throw error;
-      const conflict = await writeConflict(projectDir, entry, error, config, backend, options, session);
-      throw new WorktreeError(
-        'RESOURCE_VERSION_CONFLICT',
-        `${canonical} ${resourceId} changed remotely; conflict materials were preserved.`,
-        conflict,
-      );
+      let failure = error;
+      const versionConflict = isVersionConflict(error);
+      if (versionConflict) {
+        const conflict = await writeConflict(projectDir, entry, error, config, backend, options, session);
+        failure = new WorktreeError(
+          'RESOURCE_VERSION_CONFLICT',
+          `${canonical} ${resourceId} changed remotely; conflict materials were preserved.`,
+          conflict,
+        );
+      }
+      throwBatchFailure(failure, index, resourceId, !versionConflict);
     }
 
-    let committed = commitVersion(normalizeCommitPayload(responsePayload));
-    if (!committed.hash || (committed.version == null && committed.revision == null)) {
-      const confirmed = await backend.resolveMetadata(config, canonical, resourceId, {
-        ...options,
-        ...session,
-        clientInitialized: true,
+    try {
+      let committed = commitVersion(normalizeCommitPayload(responsePayload));
+      if (!committed.hash || (committed.version == null && committed.revision == null)) {
+        const confirmed = await backend.resolveMetadata(config, canonical, resourceId, {
+          ...options,
+          ...session,
+          clientInitialized: true,
+        });
+        assertMetadataIdentity(confirmed, canonical, resourceId);
+        committed = {
+          version: confirmed.base_version,
+          revision: confirmed.base_revision,
+          etag: confirmed.etag,
+          hash: confirmed.content_hash,
+          updated_at: confirmed.updated_at,
+          updated_by: confirmed.updated_by,
+        };
+      }
+      if (committed.hash && committed.hash !== current.hash) {
+        throw new WorktreeError(
+          'HASH_MISMATCH',
+          'DraftGo commit response hash differs from the uploaded raw bytes; manifest was not advanced.',
+          { local_hash: current.hash, remote_hash: committed.hash },
+        );
+      }
+
+      await copyFileAtomic(localPath, absolutePath(projectDir, entry.base_path), { expectedHash: current.hash });
+      entry.base_hash = current.hash;
+      entry.content_size = current.size;
+      entry.base_version = committed.version;
+      entry.base_revision = committed.revision;
+      entry.base_etag = committed.etag;
+      entry.updated_at = committed.updated_at;
+      entry.updated_by = committed.updated_by;
+      entry.committed_at = new Date().toISOString();
+      await saveManifest(projectDir, manifest);
+      report({
+        resource_type: canonical,
+        resource_id: resourceId,
+        status: 'committed',
+        hash: current.hash,
+        base_version: entry.base_version,
+        base_revision: entry.base_revision,
       });
-      assertMetadataIdentity(confirmed, canonical, resourceId);
-      committed = {
-        version: confirmed.base_version,
-        revision: confirmed.base_revision,
-        etag: confirmed.etag,
-        hash: confirmed.content_hash,
-        updated_at: confirmed.updated_at,
-        updated_by: confirmed.updated_by,
-      };
+    } catch (error) {
+      throwBatchFailure(error, index, resourceId, true);
+    }
+  }
+  return results;
+}
+
+async function reconcileResources(projectDir, resourceType, resourceIds, options = {}) {
+  const canonical = canonicalResourceType(resourceType);
+  const ids = ensureIds(resourceIds);
+  const config = options.config || loadProjectConfig(projectDir);
+  const backend = backendFor(options);
+  const manifest = loadManifest(projectDir);
+  const session = options.backend && typeof options.backend.resolveMetadata === 'function'
+    ? { client: options.client || {}, tools: options.tools || [] }
+    : await openMetadataSession(config, options);
+  const results = [];
+
+  for (const resourceId of ids) {
+    const entry = getEntry(manifest, canonical, resourceId);
+    if (!entry) throw new WorktreeError('RESOURCE_NOT_CHECKED_OUT', `${canonical} ${resourceId} is not checked out.`);
+    if (entry.server !== config.server) {
+      throw new WorktreeError('CHECKOUT_SERVER_MISMATCH', 'Checkout belongs to a different DraftGo server.');
     }
-    if (committed.hash && committed.hash !== current.hash) {
+    if (unresolvedConflict(projectDir, canonical, resourceId)) {
       throw new WorktreeError(
-        'HASH_MISMATCH',
-        'DraftGo commit response hash differs from the uploaded raw bytes; manifest was not advanced.',
-        { local_hash: current.hash, remote_hash: committed.hash },
+        'UNRESOLVED_CONFLICT',
+        `${canonical} ${resourceId} has an unresolved conflict; use conflict resolve instead of reconcile.`,
+      );
+    }
+    const remote = await backend.resolveMetadata(config, canonical, resourceId, {
+      ...options, ...session, clientInitialized: true,
+    });
+    assertMetadataIdentity(remote, canonical, resourceId);
+    const status = await inspectEntry(projectDir, entry, remote);
+    if (!status.local_matches_remote) {
+      throw new WorktreeError(
+        'RECONCILE_UNSAFE',
+        `${canonical} ${resourceId} local content does not equal remote; refusing to advance metadata.`,
+        status,
+      );
+    }
+    if (entry.content_type !== remote.content_type || entry.file_extension !== remote.file_extension) {
+      throw new WorktreeError(
+        'RECONCILE_FORMAT_CHANGED',
+        `${canonical} ${resourceId} remote content format changed; use checkout after preserving local work.`,
       );
     }
 
-    await copyFileAtomic(localPath, absolutePath(projectDir, entry.base_path), { expectedHash: current.hash });
-    entry.base_hash = current.hash;
-    entry.content_size = current.size;
-    entry.base_version = committed.version;
-    entry.base_revision = committed.revision;
-    entry.base_etag = committed.etag;
-    entry.updated_at = committed.updated_at;
-    entry.updated_by = committed.updated_by;
-    entry.committed_at = new Date().toISOString();
+    const response = await backend.download(config, remote, options);
+    const basePath = absolutePath(projectDir, entry.base_path);
+    const verifiedRemote = tempPathFor(basePath);
+    let verified;
+    try {
+      verified = await streamToFiles(response.body, [verifiedRemote], {
+        expectedHash: remote.content_hash,
+        expectedSize: remote.content_size,
+      });
+      const localAfterDownload = await hashFile(absolutePath(projectDir, entry.local_path));
+      if (localAfterDownload.hash !== verified.hash) {
+        throw new WorktreeError(
+          'RECONCILE_LOCAL_CHANGED',
+          `${canonical} ${resourceId} local content changed during reconcile; manifest was not advanced.`,
+          { local_hash: localAfterDownload.hash, remote_hash: verified.hash },
+        );
+      }
+      await copyFileAtomic(verifiedRemote, basePath, { expectedHash: verified.hash });
+    } finally {
+      await fs.promises.rm(verifiedRemote, { force: true }).catch(() => {});
+    }
+    entry.base_hash = verified.hash;
+    entry.content_size = verified.size;
+    entry.base_version = remote.base_version;
+    entry.base_revision = remote.base_revision;
+    entry.base_etag = remote.etag;
+    entry.updated_at = remote.updated_at;
+    entry.updated_by = remote.updated_by;
+    entry.reconciled_at = new Date().toISOString();
     await saveManifest(projectDir, manifest);
     results.push({
       resource_type: canonical,
       resource_id: resourceId,
-      status: 'committed',
-      hash: current.hash,
+      status: 'reconciled',
+      hash: verified.hash,
       base_version: entry.base_version,
       base_revision: entry.base_revision,
     });
@@ -454,6 +666,7 @@ module.exports = {
   conflictPaths,
   checkoutResources,
   commitResources,
+  reconcileResources,
   diffResource,
   listConflicts,
   showConflict,

package/src/worktree/status.js

@@ -0,0 +1,122 @@
+'use strict';
+
+const fs = require('fs');
+const { loadProjectConfig } = require('../projectConfig');
+const { DraftGoMcpClient } = require('../mcp/client');
+const backendDefaults = require('./backend');
+const { loadManifest, absolutePath } = require('./manifest');
+const { hashFile } = require('./streams');
+
+function versionValue(source) {
+  if (!source) return null;
+  if (source.base_version != null) return source.base_version;
+  if (source.base_revision != null) return source.base_revision;
+  return null;
+}
+
+function sameVersion(entry, remote) {
+  const local = versionValue(entry);
+  const current = versionValue(remote);
+  if (local == null || current == null) return true;
+  return String(local) === String(current);
+}
+
+async function optionalHash(projectDir, relative) {
+  if (!relative) return null;
+  const file = absolutePath(projectDir, relative);
+  return fs.existsSync(file) ? (await hashFile(file)).hash : null;
+}
+
+function classify(entry, localHash, baseHash, remote) {
+  const manifestHash = entry.base_hash;
+  const remoteHash = remote && remote.content_hash || null;
+  const baseMatchesManifest = baseHash === manifestHash;
+  const localMatchesManifest = localHash === manifestHash;
+  const localMatchesRemote = Boolean(localHash && remoteHash && localHash === remoteHash);
+  const remoteMatchesManifest = Boolean(remoteHash && remoteHash === manifestHash);
+  const versionMatches = remote ? sameVersion(entry, remote) : null;
+
+  let state;
+  let recommendation = null;
+  if (!localHash) {
+    state = 'local_missing';
+    recommendation = `draftgo checkout ${entry.resource_type} ${entry.resource_id} --force`;
+  } else if (!baseHash) {
+    state = 'base_missing';
+    recommendation = `draftgo checkout ${entry.resource_type} ${entry.resource_id} --force`;
+  } else if (!remote) {
+    state = baseMatchesManifest
+      ? (localMatchesManifest ? 'clean_local' : 'local_modified')
+      : 'local_metadata_corrupt';
+  } else if (localMatchesRemote && (!remoteMatchesManifest || !versionMatches || !baseMatchesManifest)) {
+    state = remoteMatchesManifest ? 'metadata_stale' : 'committed_unrecorded';
+    recommendation = `draftgo reconcile ${entry.resource_type} ${entry.resource_id}`;
+  } else if (!baseMatchesManifest) {
+    state = 'local_metadata_corrupt';
+    recommendation = `draftgo checkout ${entry.resource_type} ${entry.resource_id} --force`;
+  } else if (remoteMatchesManifest && versionMatches) {
+    state = localMatchesManifest ? 'clean' : 'local_modified';
+  } else if (localMatchesManifest) {
+    state = 'remote_changed';
+    recommendation = `draftgo checkout ${entry.resource_type} ${entry.resource_id}`;
+  } else {
+    state = 'diverged';
+    recommendation = `draftgo commit ${entry.resource_type} ${entry.resource_id}`;
+  }
+
+  return {
+    state,
+    local_hash: localHash,
+    base_file_hash: baseHash,
+    manifest_hash: manifestHash,
+    remote_hash: remoteHash,
+    manifest_version: versionValue(entry),
+    remote_version: versionValue(remote),
+    version_matches: versionMatches,
+    local_matches_remote: localMatchesRemote,
+    recommendation,
+  };
+}
+
+async function inspectEntry(projectDir, entry, remote = null) {
+  const [localHash, baseHash] = await Promise.all([
+    optionalHash(projectDir, entry.local_path),
+    optionalHash(projectDir, entry.base_path),
+  ]);
+  return { ...entry, ...classify(entry, localHash, baseHash, remote) };
+}
+
+async function openMetadataSession(config, options = {}) {
+  if (options.client && options.tools) return { client: options.client, tools: options.tools };
+  const client = options.client || new DraftGoMcpClient(config);
+  await client.initialize(options);
+  const tools = options.tools || await client.listAllTools(options);
+  return { client, tools };
+}
+
+async function inspectRemoteCheckouts(projectDir, options = {}) {
+  const config = options.config || loadProjectConfig(projectDir);
+  const manifest = options.manifest || loadManifest(projectDir);
+  const backend = { ...backendDefaults, ...(options.backend || {}) };
+  const session = options.backend && typeof options.backend.resolveMetadata === 'function'
+    ? { client: options.client || {}, tools: options.tools || [] }
+    : await openMetadataSession(config, options);
+  const entries = Object.values(manifest.entries);
+  return Promise.all(entries.map(async (entry) => {
+    const remote = await backend.resolveMetadata(config, entry.resource_type, entry.resource_id, {
+      ...options,
+      ...session,
+      clientInitialized: true,
+    });
+    return inspectEntry(projectDir, entry, remote);
+  }));
+}
+
+module.exports = {
+  versionValue,
+  sameVersion,
+  classify,
+  inspectEntry,
+  openMetadataSession,
+  inspectRemoteCheckouts,
+};