ds-harness-remote 0.4.8 → 0.4.10

package/dist/codex/virtual-harness.js

@@ -1,4 +1,5 @@
 import { CodexRemoteClient, deriveCodexCwdWorkspaces, projectCodexThread, } from '@dsh-remote/client-core';
+import { codexPermissionPresetFromResponse } from './permissions.js';
 const CODEX_SESSION_PREFIX = 'codex:';
 const CODEX_WORKSPACE_PREFIX = 'codex-workspace:';
 const CODEX_PROVIDER = 'codex';
@@ -245,10 +246,13 @@ export class CodexVirtualHarness {
         return this.selectedModels.get(sessionId) ?? directory?.default ?? modelSelection();
     }
     permissionSelection(sessionId) {
-        return this.selectedPermissions.get(sessionId) ?? CODEX_DEFAULT_PERMISSION;
+        return this.selectedPermissions.get(sessionId);
     }
     setPermissionSelection(sessionId, preset) {
-        this.selectedPermissions.set(sessionId, preset);
+        if (preset === undefined)
+            this.selectedPermissions.delete(sessionId);
+        else
+            this.selectedPermissions.set(sessionId, preset);
         this.publishProjection(sessionId, 'permissions', codexPermissionsProjection(preset), this.nextProjectionSeq());
     }
     commandList(args) {
@@ -275,19 +279,25 @@ export class CodexVirtualHarness {
                 result: { kind: 'error', text: 'CodeX Remote permission commands do not accept attachments.' },
             };
         const requested = (match[1] ?? '').trim();
-        if (requested === '')
+        if (requested === '') {
+            await this.readHistoryPage(threadId, { maxMessages: 1 }, signal);
             return {
                 commandId,
-                result: { kind: 'success', text: `current preset ${this.permissionSelection(sessionId)}` },
+                result: { kind: 'success', text: `current preset ${this.permissionSelection(sessionId) ?? 'Host settings (not reported)'}` },
             };
+        }
         if (!isCodexPermissionPreset(requested))
             return {
                 commandId,
                 result: { kind: 'error', text: `unknown preset "${requested}" (available: workspace-write, danger-full-access)` },
             };
         const result = await this.client.request('thread/resume', { threadId, permissionPreset: requested }, signal);
-        const effective = codexPermissionPresetFromResponse(result) ?? requested;
+        const effective = codexPermissionPresetFromResponse(result);
+        if (effective === undefined)
+            throw new Error('The Host did not confirm the CodeX permission preset.');
         this.setPermissionSelection(sessionId, effective);
+        if (effective !== requested)
+            throw new Error('The Host did not apply the requested CodeX permission preset.');
         return { commandId, result: { kind: 'success', text: `preset ${effective}` } };
     }
     sessionTitle(sessionId) {
@@ -499,8 +509,7 @@ export class CodexVirtualHarness {
         }
         if (frame.method === 'thread/settings/updated') {
             const preset = codexPermissionPresetFromResponse(params);
-            if (preset !== undefined)
-                this.setPermissionSelection(follow.sessionId, preset);
+            this.setPermissionSelection(follow.sessionId, preset);
             return;
         }
         if (frame.method === 'turn/started') {
@@ -1006,17 +1015,15 @@ export class CodexVirtualHarness {
     }
     async forkSession(request, signal) {
         const sessionId = requiredString(request.sessionId, 'sessionId');
-        let permissionPreset = this.selectedPermissions.get(sessionId);
         const result = record(await this.client.request('thread/fork', {
             threadId: nativeThreadId(sessionId),
-            ...(permissionPreset === undefined ? {} : { permissionPreset }),
         }, signal));
-        permissionPreset = codexPermissionPresetFromResponse(result) ?? permissionPreset ?? CODEX_DEFAULT_PERMISSION;
+        const permissionPreset = codexPermissionPresetFromResponse(result);
         const projected = projectCodexThread(record(result.thread));
         if (projected === undefined)
             return failure('internal', 'CodeX returned an invalid forked Thread.');
         this.selectedModels.set(projected.id, this.modelSelection(sessionId, await this.models(signal)));
-        this.selectedPermissions.set(projected.id, permissionPreset);
+        this.setPermissionSelection(projected.id, permissionPreset);
         await this.refreshAndPublishWorkspaces();
         const seq = this.nextProjectionSeq();
         this.publishProjection(projected.id, 'title', displayTitle(projected), seq);
@@ -1030,7 +1037,6 @@ export class CodexVirtualHarness {
             return failure('attachment-error', 'CodeX virtual Sessions accept text and pasted PNG, JPEG, WebP, or GIF images only.');
         const threadId = nativeThreadId(sessionId);
         const selection = this.modelSelection(sessionId, await this.models(signal));
-        let permissionPreset = this.selectedPermissions.get(sessionId);
         const isFreshBlankThread = this.blankThreads.has(threadId) || this.pendingThreads.has(threadId);
         await this.ensureRcFollow(sessionId);
         if (!isFreshBlankThread) {
@@ -1039,8 +1045,7 @@ export class CodexVirtualHarness {
                 model: selection.model,
             }, signal);
             const serverPreset = codexPermissionPresetFromResponse(resumeResult);
-            if (permissionPreset === undefined && serverPreset !== undefined) {
-                permissionPreset = serverPreset;
+            if (serverPreset !== undefined) {
                 this.setPermissionSelection(sessionId, serverPreset);
             }
         }
@@ -1057,7 +1062,6 @@ export class CodexVirtualHarness {
                 threadId,
                 input,
                 ...codexModelParams(selection),
-                ...(permissionPreset === undefined ? {} : { permissionPreset }),
             }, signal);
         }
         this.blankThreads.delete(threadId);
@@ -1153,6 +1157,10 @@ export class CodexVirtualHarness {
         if (!isCodexNativeHistoryPage(value, `codex:${threadId}`)) {
             throw new Error('CodeX Remote returned an invalid paginated History.');
         }
+        if (Object.hasOwn(value, 'permissionPreset')) {
+            const preset = value.permissionPreset;
+            this.setPermissionSelection(`codex:${threadId}`, preset === 'workspace-write' || preset === 'danger-full-access' ? preset : undefined);
+        }
         this.cacheHistoryImages(value);
         return value;
     }
@@ -2256,7 +2264,7 @@ function isCanonicalBase64(value) {
 function modelSelectionProjection(selection) {
     return { lastUsed: selection, next: selection };
 }
-function codexPermissionsProjection(currentValue) {
+function codexPermissionsProjection(preset) {
     return {
         options: [
             {
@@ -2270,7 +2278,7 @@ function codexPermissionsProjection(currentValue) {
                 description: 'Full Host file access without approval prompts for subsequent turns in this virtual Session.',
             },
         ],
-        currentValue,
+        currentValue: preset ?? 'Host settings (not reported)',
     };
 }
 function codexImageLimitsProjection() {
@@ -2286,25 +2294,6 @@ function codexImageLimitsProjection() {
 function isCodexPermissionPreset(value) {
     return value === 'workspace-write' || value === 'danger-full-access';
 }
-function codexPermissionPresetFromResponse(value) {
-    const root = record(value);
-    return codexPermissionPresetFromPolicyRecord(root)
-        ?? codexPermissionPresetFromPolicyRecord(record(root.threadSettings));
-}
-function codexPermissionPresetFromPolicyRecord(value) {
-    const sandbox = value.sandbox ?? value.sandboxPolicy;
-    if (value.approvalPolicy === 'never' && isDangerFullAccessSandbox(sandbox))
-        return 'danger-full-access';
-    if (value.approvalPolicy === 'on-request' && isWorkspaceWriteSandbox(sandbox))
-        return 'workspace-write';
-    return undefined;
-}
-function isDangerFullAccessSandbox(value) {
-    return value === 'danger-full-access' || record(value).type === 'dangerFullAccess';
-}
-function isWorkspaceWriteSandbox(value) {
-    return value === 'workspace-write' || record(value).type === 'workspaceWrite';
-}
 function modelCatalog(directory) {
     return {
         default: directory.default,