@playcraft/cli 0.1.0 → 0.1.2

package/dist/workspace-runtime/codex/loopback.js

@@ -1,3 +1,4 @@
+import { projectNativeThread } from '@playcraft/common/cloud-workspace/runtime';
 import { collectedEvent } from './native-adapter.js';
 /** In-process Codex stand-in. Not the App Server; used to prove the operation/event loop. */
 export function createLoopbackNativeAdapter() {
@@ -22,7 +23,7 @@ export function createLoopbackNativeAdapter() {
         },
         async startThread(input) {
             const threadId = `thread_${input.sessionId}`;
-            threads.set(threadId, { sessionId: input.sessionId });
+            threads.set(threadId, { sessionId: input.sessionId, items: [] });
             return { threadId };
         },
         async startTurn(input) {
@@ -40,6 +41,18 @@ export function createLoopbackNativeAdapter() {
             turnStarts += 1;
             const turnId = `turn_${input.sessionId}_${input.clientRequestId}`;
             thread.turnId = turnId;
+            thread.items.push({
+                type: 'userMessage',
+                id: `user_${turnId}`,
+                content: [{ type: 'text', text: input.text }],
+            });
+            if (!input.text.includes('[approval]')) {
+                thread.items.push({
+                    type: 'agentMessage',
+                    id: `agent_${turnId}`,
+                    text: `loopback:${input.text}`,
+                });
+            }
             queueMicrotask(() => {
                 emit(collectedEvent('notification', 'item/agentMessage/delta', {
                     threadId: input.threadId,
@@ -104,7 +117,24 @@ export function createLoopbackNativeAdapter() {
                     turn: { id: thread?.[1].turnId, status: 'completed' },
                 }));
             });
-            return { outcome: 'accepted', approvalId: input.approvalId, turnId: thread?.[1].turnId };
+            const found = thread?.[1];
+            if (found) {
+                found.items.push({
+                    type: 'agentMessage',
+                    id: `agent_${found.turnId ?? input.approvalId}`,
+                    text: 'after-approval',
+                });
+            }
+            return { outcome: 'accepted', approvalId: input.approvalId, turnId: found?.turnId };
+        },
+        async readThread(input) {
+            const thread = threads.get(input.threadId);
+            if (!thread || thread.sessionId !== input.sessionId)
+                return undefined;
+            return projectNativeThread(input.threadId, {
+                id: input.threadId,
+                turns: [{ items: thread.items }],
+            });
         },
     };
 }

package/dist/workspace-runtime/codex/model-broker.js

@@ -0,0 +1,183 @@
+import { randomBytes, timingSafeEqual } from 'node:crypto';
+import { createServer } from 'node:http';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { basename } from 'node:path';
+import { z } from 'zod';
+import { workspaceRoot } from '../workspaces/registry.js';
+const credentialSchema = z.object({
+    token: z.string().min(1), expiresAt: z.string().datetime(),
+    configId: z.string().uuid(), model: z.string().min(1).max(128),
+    claims: z.object({
+        environment: z.string(), userId: z.string(), workspaceId: z.string(), runtimeId: z.string(),
+        generation: z.number().int(), runtimeEpoch: z.number().int(),
+    }),
+});
+/** Keeps renewable execution credentials in control memory, outside Codex and project files. */
+export class WorkspaceModelBroker {
+    state;
+    server;
+    baseUrl = '';
+    entries = new Map();
+    pending = new Map();
+    requests = new Set();
+    constructor(state) {
+        this.state = state;
+    }
+    async start() {
+        if (this.server)
+            return;
+        const server = createServer({ maxHeaderSize: 8192 }, (request, response) => {
+            void this.forward(request, response);
+        });
+        await new Promise((resolve, reject) => {
+            server.once('error', reject);
+            server.listen(0, '127.0.0.1', resolve);
+        });
+        this.server = server;
+        const address = server.address();
+        if (!address || typeof address === 'string')
+            throw new Error('model_broker_unavailable');
+        this.baseUrl = `http://127.0.0.1:${address.port}`;
+    }
+    async threadConfig(cwd) {
+        const workspaceId = basename(cwd);
+        if (!this.server || await workspaceRoot(this.state, workspaceId) !== cwd)
+            throw new Error('workspace_not_registered');
+        let entry = this.entries.get(workspaceId);
+        if (!entry || entry.epoch !== this.state.runtimeEpoch) {
+            entry = { workspaceId, epoch: this.state.runtimeEpoch, capability: randomBytes(32).toString('base64url') };
+            this.entries.set(workspaceId, entry);
+        }
+        const credential = await this.credential(entry);
+        return {
+            model: credential.model,
+            modelProvider: 'playcraft_workspace',
+            config: {
+                'model_providers.playcraft_workspace': {
+                    name: 'PlayCraft Workspace', base_url: `${this.baseUrl}/${workspaceId}`,
+                    wire_api: 'responses', requires_openai_auth: false,
+                    http_headers: { Authorization: `Bearer ${entry.capability}` },
+                },
+            },
+        };
+    }
+    valid(entry) {
+        return Boolean(this.server && !this.state.journal.destroyed()
+            && this.state.runtimeEpoch === entry.epoch && this.state.journal.getWorkspace(entry.workspaceId)
+            && this.entries.get(entry.workspaceId) === entry);
+    }
+    async credential(entry) {
+        if (!this.valid(entry))
+            throw new Error('model_access_denied');
+        if (entry.credential && Date.parse(entry.credential.expiresAt) > Date.now() + 60_000)
+            return entry.credential;
+        let pending = this.pending.get(entry);
+        if (!pending) {
+            pending = this.renew(entry).finally(() => this.pending.delete(entry));
+            this.pending.set(entry, pending);
+        }
+        return pending;
+    }
+    async renew(entry) {
+        const config = this.state.config;
+        const endpoint = new URL('/runtime/internal/model-credentials', config.callbackUrl);
+        if (endpoint.protocol !== 'https:' && !(endpoint.protocol === 'http:'
+            && ['127.0.0.1', 'localhost', '[::1]'].includes(endpoint.hostname)))
+            throw new Error('model_callback_insecure');
+        const response = await fetch(endpoint, {
+            method: 'POST', redirect: 'error', signal: AbortSignal.timeout(10_000),
+            headers: { authorization: `Bearer ${config.controlToken}`, 'content-type': 'application/json' },
+            body: JSON.stringify({ runtimeId: config.runtimeId, generation: config.generation,
+                runtimeEpoch: entry.epoch, workspaceId: entry.workspaceId }),
+        });
+        if (!response.ok) {
+            const error = await response.json().catch(() => ({}));
+            throw new Error(error.reason === 'model_config_required' ? 'model_config_required' : 'model_credential_unavailable');
+        }
+        const credential = credentialSchema.parse(await response.json());
+        const claims = credential.claims;
+        if (!this.valid(entry) || claims.workspaceId !== entry.workspaceId || claims.runtimeId !== config.runtimeId
+            || claims.userId !== config.userId || claims.environment !== config.environment
+            || claims.generation !== config.generation || claims.runtimeEpoch !== entry.epoch
+            || Date.parse(credential.expiresAt) <= Date.now() + 1000)
+            throw new Error('model_credential_scope_mismatch');
+        entry.credential = credential;
+        return credential;
+    }
+    async forward(request, response) {
+        const abort = new AbortController();
+        this.requests.add(abort);
+        const cancel = () => abort.abort();
+        response.once('close', cancel);
+        try {
+            const match = /^\/([0-9a-f-]{36})\/responses$/.exec(request.url ?? '');
+            const entry = match && this.entries.get(match[1]);
+            const presented = Buffer.from(request.headers.authorization ?? '');
+            const expected = Buffer.from(entry ? `Bearer ${entry.capability}` : '');
+            if (request.method !== 'POST' || !entry || !expected.length || presented.length !== expected.length
+                || !timingSafeEqual(presented, expected) || !this.valid(entry)) {
+                response.writeHead(403);
+                response.end();
+                return;
+            }
+            const chunks = [];
+            let size = 0;
+            for await (const chunk of request) {
+                size += chunk.length;
+                if (size > 16 * 1024 * 1024) {
+                    response.writeHead(413);
+                    response.end();
+                    return;
+                }
+                chunks.push(Buffer.from(chunk));
+            }
+            const credential = await this.credential(entry);
+            if (!this.valid(entry))
+                throw new Error('model_access_denied');
+            const expires = setTimeout(cancel, Math.max(0, Date.parse(credential.expiresAt) - Date.now()));
+            try {
+                const upstream = await fetch(`${this.state.config.modelProxyUrl.replace(/\/+$/, '')}/v1/${credential.configId}/responses`, {
+                    method: 'POST', redirect: 'error', signal: abort.signal,
+                    headers: { authorization: `Bearer ${credential.token}`, 'content-type': 'application/json' },
+                    body: Buffer.concat(chunks),
+                });
+                if (upstream.status === 401 || upstream.status === 403)
+                    entry.credential = undefined;
+                response.writeHead(upstream.status, {
+                    'content-type': upstream.headers.get('content-type') ?? 'application/json', 'cache-control': 'no-store',
+                });
+                if (upstream.body)
+                    await pipeline(Readable.fromWeb(upstream.body), response);
+                else
+                    response.end();
+            }
+            finally {
+                clearTimeout(expires);
+            }
+        }
+        catch {
+            if (!response.headersSent) {
+                response.writeHead(503, { 'content-type': 'application/json', 'cache-control': 'no-store' });
+                response.end(JSON.stringify({ error: { message: 'model_credential_unavailable', type: 'server_error' } }));
+            }
+            else
+                response.destroy();
+        }
+        finally {
+            response.off('close', cancel);
+            this.requests.delete(abort);
+        }
+    }
+    async close() {
+        const server = this.server;
+        this.server = undefined;
+        this.entries.clear();
+        for (const request of this.requests)
+            request.abort();
+        if (server) {
+            server.closeAllConnections();
+            await new Promise(resolve => server.close(() => resolve()));
+        }
+    }
+}

package/dist/workspace-runtime/codex/native-adapter.js

@@ -1,3 +1,6 @@
+/** Failure before a native request was sent; safe to report as failed instead of uncertain. */
+export class NativePreparationError extends Error {
+}
 export function nativeEvent(type, payload) {
     return { type, payload, occurredAt: new Date().toISOString() };
 }

package/dist/workspace-runtime/serve.js

@@ -12,6 +12,8 @@ import { disposeTerminalHost, terminalHost } from './server/terminal-host.js';
 import { handleExecutionGroupCrash } from './server/execution-group.js';
 import { RuntimeProcessLock } from './server/lock.js';
 import { probeGitBinary } from './workspaces/git.js';
+import { WorkspaceGitCredentialBroker } from './workspaces/git-credential-broker.js';
+import { WorkspaceModelBroker } from './codex/model-broker.js';
 export async function startWorkspaceRuntime(config, options = {}) {
     process.env.PLAYCRAFT_SKIP_UPDATE_CHECK = '1';
     const negotiated = negotiateProtocol(config);
@@ -25,26 +27,31 @@ export async function startWorkspaceRuntime(config, options = {}) {
     const lock = new RuntimeProcessLock(config.stateDir);
     lock.acquire();
     let journal;
+    let gitCredentials;
     try {
         journal = new RuntimeJournal(config.stateDir);
         await journal.load();
         await mkdir(config.workspaceRoot, { recursive: true, mode: 0o700 });
-        const native = options.nativeAdapter ?? defaultNativeAdapter(config);
         const state = {
             config: { ...config, protocolMinor: negotiated.protocolMinor },
             journal,
             acceptedLeaseFence: journal.acceptedLeaseFence(),
             gitAvailable: await probeGitBinary(),
-            native,
+            native: options.nativeAdapter,
             runtimeEpoch: Math.max(config.runtimeEpoch, journal.storedRuntimeEpoch() ?? 0),
             executionQueue: Promise.resolve(),
             instanceToken: randomUUID(),
         };
+        const native = state.native ??= defaultNativeAdapter(state);
         await journal.bindRuntime({
             runtimeId: config.runtimeId,
             generation: config.generation,
             runtimeEpoch: state.runtimeEpoch,
         });
+        if (config.workspaceMode === 'multi') {
+            gitCredentials = state.gitCredentials = new WorkspaceGitCredentialBroker(state);
+            await gitCredentials.start();
+        }
         attachNativeCollector(state);
         native?.onUnexpectedExit?.((event) => {
             void handleExecutionGroupCrash(state, event.pid);
@@ -55,8 +62,10 @@ export async function startWorkspaceRuntime(config, options = {}) {
             if (group)
                 await journal.noteExecutionGroup(group);
         }
-        catch {
-            /* conversation stays adapter_not_started until Codex handshake succeeds */
+        catch (error) {
+            const code = error instanceof Error ? error.message : '';
+            state.nativeError = code === 'model_proxy_token_missing' ? code : 'codex_start_failed';
+            console.error(`[workspace-runtime] ${state.nativeError}`);
         }
         const server = createServer((request, response) => {
             void handleRuntimeRequest(state, request, response);
@@ -79,6 +88,7 @@ export async function startWorkspaceRuntime(config, options = {}) {
             state,
             url: `http://${formatHost(config.listen.host)}:${port}`,
             async close() {
+                await gitCredentials?.close();
                 disposeDesktopHost(state);
                 disposeTerminalHost(state);
                 await closeServer(server);
@@ -94,6 +104,7 @@ export async function startWorkspaceRuntime(config, options = {}) {
         };
     }
     catch (error) {
+        await gitCredentials?.close().catch(() => undefined);
         await journal?.close().catch(() => undefined);
         lock.release();
         throw error;
@@ -127,11 +138,16 @@ function closeServer(server) {
 function formatHost(host) {
     return host.includes(':') ? `[${host}]` : host;
 }
-function defaultNativeAdapter(config) {
+function defaultNativeAdapter(state) {
+    const config = state.config;
     if (process.env.PLAYCRAFT_NATIVE_ADAPTER === 'loopback')
         return createLoopbackNativeAdapter();
-    if (process.env.PLAYCRAFT_NATIVE_ADAPTER === 'codex') {
-        return createCodexAppServerAdapter({ config });
+    const managed = config.workspaceMode === 'multi' && Boolean(process.env.PLAYCRAFT_LAUNCHER_SOCKET);
+    if (process.env.PLAYCRAFT_NATIVE_ADAPTER === 'codex'
+        || (!process.env.PLAYCRAFT_NATIVE_ADAPTER && managed)) {
+        return createCodexAppServerAdapter({ config,
+            ...(managed ? { modelBroker: new WorkspaceModelBroker(state) } : {}),
+        });
     }
     return undefined;
 }

package/dist/workspace-runtime/server/dispatch.js

@@ -3,6 +3,7 @@ import { revisionScope, workspaceRoot, workspaceSessions } from '../workspaces/r
 import { join } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { checkpointRecordSchema, fileWritePayloadSchema, gitCommitPayloadSchema, gitPushPayloadSchema, parameterPatchPayloadSchema, terminalCreatePayloadSchema, terminalProcessIdentity, transitionOperation, } from '@playcraft/common/cloud-workspace/runtime';
+import { NativePreparationError } from '../codex/native-adapter.js';
 import { disposeTerminalHost } from './terminal-host.js';
 import { captureWorkspaceTree, materializeSnapshot, publishFileSnapshot, } from '../workspaces/file-snapshot.js';
 import { InvalidWorkspacePathError, resolveWorkspaceFile, restoreWorkspaceFiles, snapshotWorkspaceFiles, writeWorkspaceFile, } from '../workspaces/files.js';
@@ -117,10 +118,19 @@ async function executeScopedOperation(state, scopeKey, operation, payload) {
 }
 async function executeCreate(state, scopeKey, operation) {
     const sessionId = required(operation.sessionId, 'sessionId');
-    const started = await native(state).startThread({
-        sessionId,
-        cwd: await workspaceRoot(state, operation.workspaceId),
-    });
+    let started;
+    try {
+        started = await native(state).startThread({
+            sessionId,
+            cwd: await workspaceRoot(state, operation.workspaceId),
+        });
+    }
+    catch (error) {
+        if (error instanceof NativePreparationError) {
+            return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: error.message }));
+        }
+        throw error;
+    }
     if (!started.threadId) {
         return persist(state, scopeKey, transitionOperation(operation, 'uncertain', { error: 'native_receipt_lost' }));
     }
@@ -469,6 +479,7 @@ async function executeRestore(state, scopeKey, operation, payload) {
 }
 async function executeDestroy(state, scopeKey, operation) {
     await state.journal.markDestroyed();
+    await state.gitCredentials?.destroy();
     disposeTerminalHost(state);
     try {
         await state.native?.close?.();

package/dist/workspace-runtime/server/http.js

@@ -1,7 +1,7 @@
 import { readObservedFile, withObservedFile } from '../workspaces/revisions.js';
 import { registerWorkspace, revisionScope, workspaceRoot, WorkspaceContextError } from '../workspaces/registry.js';
 import { randomUUID } from 'node:crypto';
-import { workspaceRegistrationRequestSchema, HTTP_STATUS_BY_ERROR, assertLeaseFence, buildHandshakeDocument, capability, findUntrustedRuntimeFields, hashOperationPayload, instanceRebuildRequestSchema, sourceAckSchema, operationAcceptRequestSchema, operationKindSchema, operationScopeKey, resolveIdempotentAccept, runtimeError, unavailableRuntimeCapabilities, } from '@playcraft/common/cloud-workspace/runtime';
+import { workspaceRegistrationRequestSchema, HTTP_STATUS_BY_ERROR, assertLeaseFence, buildHandshakeDocument, capability, findUntrustedRuntimeFields, hashOperationPayload, instanceRebuildRequestSchema, sourceAckSchema, operationAcceptRequestSchema, operationKindSchema, operationScopeKey, resolveIdempotentAccept, nativeHistoryReadSchema, runtimeError, unavailableRuntimeCapabilities, } from '@playcraft/common/cloud-workspace/runtime';
 import { controlTokenMatches, extractControlToken } from './auth.js';
 import { canExecuteKind, executeOperation } from './dispatch.js';
 import { InvalidWorkspacePathError, listWorkspaceFiles, } from '../workspaces/files.js';
@@ -64,6 +64,11 @@ export async function handleRuntimeRequest(state, request, response) {
             writeJson(response, 200, handshake(state));
             return;
         }
+        const historyPath = sessionHistoryPath(url.pathname);
+        if (request.method === 'GET' && historyPath) {
+            await handleSessionHistory(state, response, historyPath.workspaceId, historyPath.sessionId);
+            return;
+        }
         if (isUnimplementedWorkbenchPath(url.pathname)) {
             if (writeDestroyed(state, response))
                 return;
@@ -206,7 +211,7 @@ function handshake(state) {
         if (item.name === 'conversation') {
             if (conversationReady)
                 return capability('conversation', true);
-            return destroyed ? capability('conversation', false, 'runtime_destroyed') : item;
+            return capability('conversation', false, destroyed ? 'runtime_destroyed' : state.nativeError ?? 'adapter_not_started');
         }
         if (item.name === 'files') {
             return filesReady
@@ -538,11 +543,69 @@ function unavailableReason(state, kind) {
         return 'runtime_destroyed';
     if (kind === 'preview.publish')
         return 'capability_not_implemented';
-    return 'adapter_not_started';
+    return state.nativeError ?? 'adapter_not_started';
+}
+function sessionHistoryPath(pathname) {
+    const match = pathname.match(/^\/runtime\/workspaces\/([^/]+)\/sessions\/([^/]+)\/history$/);
+    if (!match?.[1] || !match[2])
+        return undefined;
+    try {
+        return {
+            workspaceId: decodeURIComponent(match[1]),
+            sessionId: decodeURIComponent(match[2]),
+        };
+    }
+    catch {
+        return undefined;
+    }
 }
 function isUnimplementedWorkbenchPath(pathname) {
     const parts = pathname.split('/').filter(Boolean);
-    return parts[0] === 'runtime' && (parts.includes('previews') || parts.includes('history'));
+    return parts[0] === 'runtime' && parts.includes('previews');
+}
+async function handleSessionHistory(state, response, workspaceId, sessionId) {
+    if (writeDestroyed(state, response))
+        return;
+    const session = state.journal.getSession(sessionId);
+    if (!session || (session.workspaceId && session.workspaceId !== workspaceId)) {
+        writeJson(response, 404, { error: 'session_not_found' });
+        return;
+    }
+    if (state.config.workspaceMode === 'multi' && session.workspaceId !== workspaceId) {
+        writeJson(response, 404, { error: 'session_not_found' });
+        return;
+    }
+    const readThread = state.native?.readThread;
+    if (!readThread) {
+        writeError(response, runtimeError('capability_unavailable', 'native_history_unavailable'));
+        return;
+    }
+    let read;
+    try {
+        read = await readThread({ threadId: session.threadId, sessionId });
+    }
+    catch {
+        writeError(response, runtimeError('capability_unavailable', 'native_history_unavailable'));
+        return;
+    }
+    if (!read || read.threadId !== session.threadId) {
+        writeError(response, runtimeError('capability_unavailable', 'native_history_unavailable'));
+        return;
+    }
+    const body = nativeHistoryReadSchema.safeParse({
+        source: 'native',
+        sessionId,
+        workspaceId,
+        threadId: read.threadId,
+        ...(read.threadName ? { threadName: read.threadName } : {}),
+        truncated: read.truncated,
+        items: read.items,
+    });
+    if (!body.success) {
+        writeError(response, runtimeError('capability_unavailable', 'native_history_unavailable'));
+        return;
+    }
+    writeJson(response, 200, body.data);
 }
 async function readObservedParameters(state, workspaceId) {
     const root = await workspaceRoot(state, workspaceId);