codex-overleaf-link 2.3.0 → 2.3.2

package/extension/src/pageBridge.js

@@ -22,6 +22,7 @@
   let projectSnapshotBridge = null;
   let writebackRouter = null;
   let writeGuard = null;
+  let binaryAssetUploader = null;
   const saveState = requirePageModule('CodexOverleafSaveState').create({
     delay,
     detectEditor,
@@ -66,6 +67,12 @@
     treeOperations,
     window
   });
+  binaryAssetUploader = requirePageModule('CodexOverleafBinaryAssetUploader').create({
+    document,
+    snapshotRouter,
+    treeOperations,
+    window
+  });
   writeGuard = requirePageModule('CodexOverleafWriteGuard').create({
     document,
     treeOperations,
@@ -207,6 +214,10 @@
         requireEditing: params.requireEditing === true,
         runProjectId: typeof params.runProjectId === 'string' ? params.runProjectId : ''
       }),
+    binaryUploadBegin: params => binaryAssetUploader.begin(params),
+    binaryUploadAppend: params => binaryAssetUploader.append(params),
+    binaryUploadCommit: params => binaryAssetUploader.commit(params),
+    binaryUploadAbort: params => binaryAssetUploader.abort(params),
     jumpToPosition,
     rejectTrackedChanges,
     acceptTrackedChanges,
@@ -613,7 +624,7 @@
       return range;
     }
 
-    const focused = editorAdapter.focusActiveEditorRange(range.from, range.to);
+    let focused = editorAdapter.focusActiveEditorRange(range.from, range.to);
     if (!focused.ok) {
       return {
         ...focused,
@@ -621,6 +632,24 @@
       };
     }
 
+    if (params.line !== undefined) {
+      // Overleaf can publish the new file path and text before its unstable
+      // store swaps in the final CodeMirror view. Re-resolve the editor after
+      // two short settlement windows so a first dispatch to the retiring view
+      // cannot leave the visible cursor at its old line. Repeating an already
+      // successful selection is idempotent.
+      for (let attempt = 0; attempt < 2; attempt += 1) {
+        await delay(120);
+        if (getActiveFilePath() !== filePath) {
+          break;
+        }
+        const settled = editorAdapter.focusActiveEditorRange(range.from, range.to);
+        if (settled.ok) {
+          focused = settled;
+        }
+      }
+    }
+
     return {
       ok: true,
       method: focused.method,

package/extension/src/shared/agentTranscript.js

@@ -727,10 +727,17 @@
     if (providerError) {
       return providerError;
     }
-    if (/Mode must be "confirm" or "auto"/i.test(text)) {
+    if (/suggest_mode_removed|Suggest mode has been removed/i.test(text)) {
+      return {
+        conclusion: textFor(locale, '建议修改模式已经移除。', 'Suggest mode has been removed.'),
+        nextStep: textFor(locale, '请刷新扩展，然后选择“只问不改”或“自动写入”。', 'Reload the extension, then choose Ask or Auto.'),
+        failureCode: 'suggest_mode_removed'
+      };
+    }
+    if (/Mode must be "(?:confirm|ask)" or "auto"/i.test(text)) {
       return {
         conclusion: textFor(locale, '这轮没有写入：当前是“只问不改”，但这个任务需要写入权限。', 'No files were written: this task needs write access, but the current mode is Ask.'),
-        nextStep: textFor(locale, '请切换到“建议修改”或“自动写入”后重新运行。', 'Switch to Suggest or Auto and run the task again.'),
+        nextStep: textFor(locale, '请切换到“自动写入”后重新运行。', 'Switch to Auto and run the task again.'),
         failureCode: null  // no direct catalog match — preflight / governance
       };
     }
@@ -797,7 +804,7 @@
     if (/checkpoint/i.test(text)) {
       return {
         conclusion: textFor(locale, '这轮没有自动写入：Codex 没有拿到可恢复版本。', 'This run did not auto-write: Codex did not get a recoverable version.'),
-        nextStep: textFor(locale, '请切换到“建议修改”，或确认 Overleaf Reviewing 已开启后再用“自动写入”。', 'Switch to Suggest, or confirm Overleaf Reviewing is enabled before using Auto.'),
+        nextStep: textFor(locale, '请确认 Overleaf Reviewing 已开启后再用“自动写入”。', 'Confirm that Overleaf Reviewing is enabled before using Auto.'),
         failureCode: null  // no current catalog code; preflight reviewing issue
       };
     }

package/extension/src/shared/compatibility.js

@@ -12,7 +12,7 @@
   const MIN_NATIVE_VERSION = '1.0.0';
   const MIN_COMPATIBLE_NATIVE_VERSION = '1.0.0';
   const MIN_COMPATIBLE_EXTENSION_VERSION = '1.0.0';
-  const BUILD_TARGET_VERSION = '2.3.0';
+  const BUILD_TARGET_VERSION = '2.3.2';
   const DEFAULT_CHROME_EXTENSION_ID = 'illdpneeeopfffmiepaejglgmhpmdhdc';
   const REQUIRED_CAPABILITIES = Object.freeze([
     'bridgePing',
@@ -26,7 +26,9 @@
     'historyClearPlugin',
     'localSkills',
     'mirrorSensitiveScan',
-    'providerProfiles'
+    'providerProfiles',
+    'assetTransfer',
+    'threadFork'
   ]);
   const UPDATE_AVAILABLE_CAPABILITIES = Object.freeze([
     'bridgePing',

package/extension/src/shared/i18n.js

@@ -94,6 +94,14 @@
       deleteSessionHistoryFailedToast: 'Deleted this plugin session, but the matching plugin-local Codex thread history was not fully cleared: {message}',
       deleteSessionNoThreadToast: 'Deleted this plugin session. This old session had no identifiable local Codex thread history, so no local history was cleared.',
       deleteSessionDoneToast: 'Deleted this plugin session.',
+      forkRunTitle: 'Fork a new conversation from this turn',
+      forkRunUnavailable: 'This turn cannot be forked because its Codex thread position is unavailable.',
+      forkRunFailed: 'Could not fork this conversation.',
+      forkRunDone: 'Forked conversation created.',
+      forkSessionTitle: '{title} (fork)',
+      copyConclusionTitle: 'Copy conclusion',
+      copyConclusionDone: 'Conclusion copied',
+      copyConclusionFailed: 'Could not copy conclusion',
       modeSwitchFailedToast: 'Could not switch mode: {message}',
       diffAccepted: 'Accepted',
       diffRejected: 'Rejected',
@@ -266,8 +274,6 @@
       writeMode: 'Write mode',
       modeAsk: 'Ask',
       modeAskTitle: 'Read and analyze only. Do not write to Overleaf.',
-      modeConfirm: 'Suggest',
-      modeConfirmTitle: 'Show a change plan first, then write after approval.',
       modeAuto: 'Auto',
       modeAutoTitle: 'Write directly after authorization. Deletes still require confirmation.',
       addContext: 'Add @ context',
@@ -403,6 +409,7 @@
       refreshProbeDone: 'Refreshed: {status}',
       refreshProbeFailed: 'Refresh failed. Reload Overleaf and try again.',
       processedFailed: 'Failed {elapsed}',
+      processedCancelled: 'Cancelled {elapsed}',
       processing: 'Running {elapsed}',
       processed: 'Done {elapsed}',
       restoredRunStoppedTitle: 'Stopped tracking this run after a page refresh',
@@ -607,6 +614,14 @@
       deleteSessionHistoryFailedToast: '已删除这个插件会话，但对应的插件本地 Codex 线程历史没有清理完成：{message}',
       deleteSessionNoThreadToast: '已删除这个插件会话；这个旧会话没有可识别的本地 Codex 线程历史，未清理本地历史。',
       deleteSessionDoneToast: '已删除这个插件会话。',
+      forkRunTitle: '从此轮分叉一个新对话',
+      forkRunUnavailable: '该轮缺少可定位的 Codex thread 节点，无法分叉。',
+      forkRunFailed: '无法分叉此对话。',
+      forkRunDone: '已创建分叉对话。',
+      forkSessionTitle: '{title}（分叉）',
+      copyConclusionTitle: '复制结论',
+      copyConclusionDone: '已复制结论',
+      copyConclusionFailed: '无法复制结论',
       modeSwitchFailedToast: '切换模式失败：{message}',
       diffAccepted: '已接受',
       diffRejected: '已拒绝',
@@ -779,8 +794,6 @@
       writeMode: '写入模式',
       modeAsk: '只问不改',
       modeAskTitle: '只读取和分析，不写入 Overleaf',
-      modeConfirm: '建议修改',
-      modeConfirmTitle: '先给出修改方案，确认后写入',
       modeAuto: '自动写入',
       modeAutoTitle: '授权后直接写入，删除仍需确认',
       addContext: '添加 @ 上下文',
@@ -916,6 +929,7 @@
       refreshProbeDone: '已重新检测：{status}',
       refreshProbeFailed: '检测失败：请刷新 Overleaf 页面后重试',
       processedFailed: '处理失败 {elapsed}',
+      processedCancelled: '已取消 {elapsed}',
       processing: '处理中 {elapsed}',
       processed: '已处理 {elapsed}',
       restoredRunStoppedTitle: '页面刷新后已停止跟踪这轮任务',

package/extension/src/shared/models.js

@@ -62,13 +62,13 @@
     const normalized = {
       id,
       label,
-      reasoningEfforts: Array.isArray(model?.reasoningEfforts) ? model.reasoningEfforts.slice() : [],
+      reasoningEfforts: normalizeReasoningEfforts(model?.reasoningEfforts),
       reasoningPresentation: typeof model?.reasoningPresentation === 'string' ? model.reasoningPresentation : '',
       speedTiers: normalizeSpeedTiers(model?.speedTiers)
     };
 
     if (Object.prototype.hasOwnProperty.call(Object(model), 'defaultReasoningEffort')) {
-      normalized.defaultReasoningEffort = model.defaultReasoningEffort;
+      normalized.defaultReasoningEffort = normalizeReasoningEffort(model.defaultReasoningEffort);
     }
     if (Object.prototype.hasOwnProperty.call(Object(model), 'defaultSpeedTier')) {
       normalized.defaultSpeedTier = model.defaultSpeedTier;
@@ -77,6 +77,17 @@
     return normalized;
   }
 
+  function normalizeReasoningEfforts(reasoningEfforts) {
+    if (!Array.isArray(reasoningEfforts)) {
+      return [];
+    }
+    return Array.from(new Set(reasoningEfforts.map(normalizeReasoningEffort).filter(Boolean)));
+  }
+
+  function normalizeReasoningEffort(reasoningEffort) {
+    return normalizeModelId(reasoningEffort);
+  }
+
   function normalizeSpeedTiers(speedTiers) {
     if (!Array.isArray(speedTiers)) {
       return ['standard'];

package/extension/src/shared/pageRpcContract.js

@@ -5,7 +5,7 @@
 })(typeof window !== 'undefined' ? window : (typeof globalThis !== 'undefined' ? globalThis : this), function () {
   'use strict';
 
-  var REVISION = '2026-07-26-page-rpc-contract-v13';
+  var REVISION = '2026-08-04-page-rpc-contract-v15';
   var METHODS = freezeCatalog({
     initializeCapability: entry('bridge.initialize', 'control', 'none', 'default', false, 'none'),
     probe: entry('bridge.probe', 'read', 'none', 'default', false, 'safe'),
@@ -17,6 +17,10 @@
     ensureReviewing: entry('reviewing.enable', 'page_state', 'optional', 'default', true, 'idempotent'),
     ensureEditing: entry('reviewing.disable', 'page_state', 'optional', 'default', true, 'idempotent'),
     applyOperations: entry('document.write', 'document', 'required', 'writeback', true, 'no_retry'),
+    binaryUploadBegin: entry('asset.stage', 'cache', 'required', 'default', false, 'no_retry'),
+    binaryUploadAppend: entry('asset.stage', 'cache', 'none', 'writeback', true, 'no_retry'),
+    binaryUploadCommit: entry('asset.write', 'document', 'required', 'writeback', true, 'no_retry'),
+    binaryUploadAbort: entry('asset.stage', 'cache', 'none', 'default', false, 'idempotent'),
     jumpToPosition: entry('editor.navigate', 'navigation', 'required', 'default', false, 'idempotent'),
     rejectTrackedChanges: entry('tracked_changes.reject', 'document', 'required', 'lifecycle', true, 'no_retry'),
     acceptTrackedChanges: entry('tracked_changes.accept', 'document', 'required', 'lifecycle', true, 'no_retry'),
@@ -67,7 +71,7 @@
       file_list: 35000,
       compile: 75000,
       lifecycle: 120000,
-      writeback: 30000
+      writeback: 45000
     };
     var candidate = Number(overrides[timeoutClass]);
     return Number.isFinite(candidate) && candidate > 0 ? candidate : defaults[timeoutClass];

package/extension/src/shared/runExecutionSnapshot.js

@@ -28,7 +28,10 @@
       : rawQueueItem;
     const persisted = rawQueueItem?.executionSnapshot || rawPayload?.executionSnapshot;
     if (persisted && typeof persisted === 'object') {
-      return Codec.normalizeSnapshot(persisted, { source: persisted.source || 'submitted' });
+      return Codec.normalizeSnapshot(persisted, {
+        source: persisted.source || 'submitted',
+        migrateLegacyConfirm: true
+      });
     }
     const raw = rawPayload && typeof rawPayload === 'object' ? rawPayload : {};
     const fallback = fallbackInput && typeof fallbackInput === 'object' ? fallbackInput : {};
@@ -48,13 +51,17 @@
       inferred = true;
     }
     return Codec.normalizeSnapshot(captured, {
-      source: inferred ? 'legacy-inferred' : 'legacy-captured'
+      source: inferred ? 'legacy-inferred' : 'legacy-captured',
+      migrateLegacyConfirm: true
     });
   }
 
   function resolveForExecution(value = {}, options = {}) {
     const persisted = value.executionSnapshot || value;
-    const snapshot = Codec.normalizeSnapshot(persisted, { source: persisted.source || 'submitted' });
+    const snapshot = Codec.normalizeSnapshot(persisted, {
+      source: persisted.source || 'submitted',
+      migrateLegacyConfirm: true
+    });
     if (snapshot.providerId === 'builtin') return Codec.normalizeSnapshot(snapshot, { source: snapshot.source });
     const catalog = options.catalog || {};
     const provider = ProviderProfiles?.getProviderById
@@ -80,7 +87,10 @@
 
   function snapshotOf(value = {}) {
     const persisted = value.executionSnapshot || value;
-    return Codec.normalizeSnapshot(persisted, { source: persisted.source || 'submitted' });
+    return Codec.normalizeSnapshot(persisted, {
+      source: persisted.source || 'submitted',
+      migrateLegacyConfirm: true
+    });
   }
 
   function cloneSnapshot(value = {}) {

package/extension/src/shared/runExecutionSnapshotCodec.js

@@ -8,7 +8,7 @@
   'use strict';
 
   const SCHEMA_VERSION = 1;
-  const VALID_MODES = new Set(['ask', 'confirm', 'auto']);
+  const VALID_MODES = new Set(['ask', 'auto']);
   const VALID_SOURCES = new Set(['submitted', 'legacy-captured', 'legacy-inferred']);
   const TUPLE_FIELDS = Object.freeze([
     'mode', 'providerId', 'providerRevision', 'model', 'reasoningEffort',
@@ -19,12 +19,15 @@
   function normalizeSnapshot(value = {}, options = {}) {
     const input = value && typeof value === 'object' ? value : {};
     assertNoSecretFields(input);
+    if (input.mode === 'confirm' && options.migrateLegacyConfirm !== true) {
+      throw snapshotError('suggest_mode_removed', 'Suggest mode has been removed. Choose Ask or Auto.');
+    }
     const providerId = normalizeText(input.providerId) || 'builtin';
     const revision = normalizeRevisionResult(input.providerRevision);
     if (!revision.ok) throw snapshotError('provider_revision_conflict', revision.error);
     const snapshot = {
       schemaVersion: SCHEMA_VERSION,
-      mode: VALID_MODES.has(input.mode) ? input.mode : 'ask',
+      mode: input.mode === 'auto' ? 'auto' : 'ask',
       providerId,
       providerRevision: providerId === 'builtin' ? '' : revision.value,
       model: normalizeText(input.model).slice(0, 160),

package/extension/src/shared/scopedPersistenceQueuePolicy.js

@@ -35,8 +35,27 @@
   }
 
   function normalizeMeta(value) {
+    var revision = normalizeRevision(value && value.revision);
+    var hasDurableRevision = Boolean(value
+      && Object.prototype.hasOwnProperty.call(value, 'durableRevision'));
+    var durableRevision = hasDurableRevision
+      ? Math.min(normalizeRevision(value.durableRevision), revision)
+      : revision;
+    var pendingValue = value && value.pendingCommit;
+    var pendingRevision = normalizeRevision(pendingValue && pendingValue.revision);
+    var pendingCommit = pendingValue && typeof pendingValue === 'object'
+      && pendingRevision > durableRevision
+      && pendingRevision <= revision
+      ? {
+          revision: pendingRevision,
+          writerId: cleanPart(pendingValue.writerId),
+          startedAt: cleanPart(pendingValue.startedAt)
+        }
+      : null;
     return {
-      revision: normalizeRevision(value && value.revision),
+      revision: revision,
+      durableRevision: durableRevision,
+      pendingCommit: pendingCommit,
       queueRevision: normalizeRevision(value && value.queueRevision),
       writerId: cleanPart(value && value.writerId),
       updatedAt: cleanPart(value && value.updatedAt),

package/extension/src/shared/scopedPersistenceReceipt.js

@@ -0,0 +1,60 @@
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) {
+    module.exports = factory();
+  } else {
+    root.CodexOverleafModuleRegistry.define('ScopedPersistenceReceipt', [], factory);
+  }
+})(typeof globalThis !== 'undefined' ? globalThis : this, function () {
+  'use strict';
+
+  function createFenceMeta(meta, currentMeta, writerId) {
+    var startedAt = new Date().toISOString();
+    var revision = currentMeta.revision + 1;
+    return {
+      ...meta,
+      revision: revision,
+      durableRevision: currentMeta.durableRevision,
+      pendingCommit: { revision: revision, writerId: writerId, startedAt: startedAt },
+      writerId: writerId,
+      updatedAt: startedAt
+    };
+  }
+
+  function createCommittedMeta(fenceMeta) {
+    return {
+      ...fenceMeta,
+      durableRevision: fenceMeta.revision,
+      pendingCommit: null,
+      updatedAt: new Date().toISOString()
+    };
+  }
+
+  function createRecoveredMeta(currentMeta, fenceMeta, writerId) {
+    var revision = fenceMeta.revision + 1;
+    return {
+      ...currentMeta,
+      revision: revision,
+      durableRevision: revision,
+      pendingCommit: null,
+      queueRevision: fenceMeta.queueRevision + 1,
+      writerId: writerId,
+      updatedAt: new Date().toISOString()
+    };
+  }
+
+  function decorateReceiptError(error, revision) {
+    if (error && typeof error === 'object') {
+      error.code = error.code || 'persistence_receipt_write_failed';
+      error.persistenceActionCommitted = true;
+      error.persistenceRevision = revision;
+    }
+    return error;
+  }
+
+  return Object.freeze({
+    createFenceMeta: createFenceMeta,
+    createCommittedMeta: createCommittedMeta,
+    createRecoveredMeta: createRecoveredMeta,
+    decorateReceiptError: decorateReceiptError
+  });
+});

package/extension/src/shared/scopedPersistenceTransaction.js

@@ -2,15 +2,17 @@
   if (typeof module === 'object' && module.exports) {
     module.exports = factory(
       require('./scopedPersistenceQueuePolicy'),
-      require('./scopedPersistenceBrowserAdapter')
+      require('./scopedPersistenceBrowserAdapter'),
+      require('./scopedPersistenceReceipt')
     );
   } else {
     root.CodexOverleafModuleRegistry.define('ScopedPersistenceTransaction', [
       'ScopedPersistenceQueuePolicy',
-      'ScopedPersistenceBrowserAdapter'
+      'ScopedPersistenceBrowserAdapter',
+      'ScopedPersistenceReceipt'
     ], factory);
   }
-})(typeof globalThis !== 'undefined' ? globalThis : this, function (QueuePolicy, BrowserAdapter) {
+})(typeof globalThis !== 'undefined' ? globalThis : this, function (QueuePolicy, BrowserAdapter, Receipt) {
   'use strict';
 
   var applyQueueMutations = QueuePolicy.applyQueueMutations;
@@ -43,9 +45,9 @@
       var scope = normalizeScope(inputScope);
       generation += 1;
       var tokenGeneration = generation;
-      active = makeToken(scope, tokenGeneration, 0, false, 0);
+      active = tokenFromMeta(scope, tokenGeneration, false, {});
       var meta = await strictRead(adapter, scope);
-      var token = makeToken(scope, tokenGeneration, meta.revision, false, meta.queueRevision);
+      var token = tokenFromMeta(scope, tokenGeneration, false, meta);
       if (active && active.generation === tokenGeneration && sameScope(active, token)) active = token;
       return token;
     }
@@ -60,10 +62,10 @@
         });
       }
       if (!detached && active && sameScope(active, scope)) {
-        return makeToken(scope, active.generation, active.revision, false, active.queueRevision);
+        return tokenFromMeta(scope, active.generation, false, active);
       }
       var meta = await strictRead(adapter, scope);
-      return makeToken(scope, detached ? 0 : generation, meta.revision, detached, meta.queueRevision);
+      return tokenFromMeta(scope, detached ? 0 : generation, detached, meta);
     }
 
     function isCurrent(token) {
@@ -94,13 +96,7 @@
         if (queueMutations.length
           && currentMeta.queueRevision !== normalizeRevision(token.queueRevision)) {
           if (!token.detached && isCurrent(token)) {
-            active = makeToken(
-              scope,
-              token.generation,
-              currentMeta.revision,
-              false,
-              currentMeta.queueRevision
-            );
+            active = tokenFromMeta(scope, token.generation, false, currentMeta);
           }
           return {
             ok: false,
@@ -112,33 +108,26 @@
         }
         var projected = applyQueueMutations(currentMeta, queueMutations, writerId);
         if (!projected.ok) return projected;
-        var nextMeta = {
+        var nextMeta = Receipt.createFenceMeta({
           ...projected.meta,
-          revision: currentMeta.revision + 1,
-          writerId: writerId,
-          updatedAt: new Date().toISOString(),
           sessionTombstones: mergeTombstones(
             projected.meta.sessionTombstones,
             commitOptions && commitOptions.sessionTombstones,
             200
           )
-        };
+        }, currentMeta, writerId);
         await adapter.write(scope, nextMeta);
         if (!token.detached && isCurrent(token)) {
-          active = makeToken(
-            scope,
-            token.generation,
-            nextMeta.revision,
-            false,
-            nextMeta.queueRevision
-          );
+          active = tokenFromMeta(scope, token.generation, false, nextMeta);
         }
         var value;
         try {
           value = await action({
             scope: scope,
             baseRevision: currentMeta.revision,
+            durableRevision: currentMeta.durableRevision,
             conflict: conflict,
+            previousCommitIncomplete: Boolean(currentMeta.pendingCommit),
             writerId: writerId,
             currentMeta: currentMeta,
             nextMeta: nextMeta
@@ -147,23 +136,11 @@
           if (queueMutations.some(function (mutation) {
             return ['remove', 'release', 'restore'].includes(cleanPart(mutation.type));
           })) {
-            var recoveredMeta = {
-              ...currentMeta,
-              revision: nextMeta.revision + 1,
-              queueRevision: nextMeta.queueRevision + 1,
-              writerId: writerId,
-              updatedAt: new Date().toISOString()
-            };
+            var recoveredMeta = Receipt.createRecoveredMeta(currentMeta, nextMeta, writerId);
             try {
               await adapter.write(scope, recoveredMeta);
               if (!token.detached && isCurrent(token)) {
-                active = makeToken(
-                  scope,
-                  token.generation,
-                  recoveredMeta.revision,
-                  false,
-                  recoveredMeta.queueRevision
-                );
+                active = tokenFromMeta(scope, token.generation, false, recoveredMeta);
               }
             } catch (recoveryError) {
               if (error && typeof error === 'object') {
@@ -173,13 +150,24 @@
           }
           throw error;
         }
+        var committedMeta = Receipt.createCommittedMeta(nextMeta);
+        try {
+          await adapter.write(scope, committedMeta);
+        } catch (error) {
+          throw Receipt.decorateReceiptError(error, nextMeta.revision);
+        }
+        if (!token.detached && isCurrent(token)) {
+          active = tokenFromMeta(scope, token.generation, false, committedMeta);
+        }
         return {
           ok: true,
           value: value,
-          revision: nextMeta.revision,
-          queueRevision: nextMeta.queueRevision,
-          queueClaims: nextMeta.queueClaims,
+          revision: committedMeta.revision,
+          durableRevision: committedMeta.durableRevision,
+          queueRevision: committedMeta.queueRevision,
+          queueClaims: committedMeta.queueClaims,
           rebased: conflict,
+          recoveredIncompleteCommit: Boolean(currentMeta.pendingCommit),
           superseded: !token.detached && !isCurrent(token)
         };
       });
@@ -190,9 +178,7 @@
       captureCommitView: captureCommitView,
       commit: commit,
       getActiveView: function () {
-        return active
-          ? makeToken(active, active.generation, active.revision, false, active.queueRevision)
-          : null;
+        return active ? tokenFromMeta(active, active.generation, false, active) : null;
       },
       getWriterId: function () { return writerId; },
       invalidate: function () {
@@ -203,17 +189,34 @@
     });
   }
 
-  function makeToken(scope, tokenGeneration, revision, detached, queueRevision) {
+  function makeToken(
+    scope,
+    tokenGeneration,
+    revision,
+    detached,
+    queueRevision,
+    durableRevision,
+    pendingCommit
+  ) {
     return Object.freeze({
       accountScopeId: scope.accountScopeId,
       projectId: scope.projectId,
       generation: normalizeRevision(tokenGeneration),
       revision: normalizeRevision(revision),
+      durableRevision: normalizeRevision(durableRevision),
+      pendingCommit: pendingCommit && typeof pendingCommit === 'object'
+        ? Object.freeze({ ...pendingCommit })
+        : null,
       queueRevision: normalizeRevision(queueRevision),
       detached: detached === true
     });
   }
 
+  function tokenFromMeta(scope, tokenGeneration, detached, meta) {
+    return makeToken(scope, tokenGeneration, meta.revision, detached, meta.queueRevision,
+      meta.durableRevision, meta.pendingCommit);
+  }
+
   async function strictRead(adapter, scope) {
     return normalizeMeta(await adapter.read(scope));
   }