diff --git a/apple/aesel/Sources/AeselApp.swift b/apple/aesel/Sources/AeselApp.swift index ca3656f92e..9d718fa765 100644 --- a/apple/aesel/Sources/AeselApp.swift +++ b/apple/aesel/Sources/AeselApp.swift @@ -61,11 +61,21 @@ struct AeselApp: App { started = true #if DEBUG if ProcessInfo.processInfo.environment["AESEL_NOTEBOOK_PREVIEW"] == "1" { + session.currentThreadID = "notebook-preview" session.signedIn = true session.handle = "jeffrey" session.route = "@jeffrey/notebook" session.shareURL = URL(string: "https://aesthetic.computer/blank") session.model = "openai/gpt-5.6-luna" + if let provider = ProcessInfo.processInfo.environment["AESEL_PREVIEW_PROVIDER"], + ["claude", "codex"].contains(provider) { + session.signedIn = false + session.handle = "" + session.provider = provider + session.providers = [ProviderChoice(id: provider, available: true, notice: "")] + session.model = "" + session.modelChoices = [ModelChoice(id: "", title: "CLI default", premium: false)] + } session.status = "ready" session.braincells = 482000 session.braincellDollars = 2.41 diff --git a/apple/aesel/Sources/ContentView.swift b/apple/aesel/Sources/ContentView.swift index 22989eb320..23ad5149c4 100644 --- a/apple/aesel/Sources/ContentView.swift +++ b/apple/aesel/Sources/ContentView.swift @@ -447,7 +447,8 @@ struct ContentView: View { case "/buy": openSettings(); Task { await braincells.buy() } case "/help": showHelp = true default: - guard session.signedIn else { host.signIn(); return } + if session.provider == "ac" && !session.signedIn { host.signIn(); return } + guard session.canStartTurn else { openSettings(); return } host.ask(text) } draft = "" @@ -465,8 +466,9 @@ struct ContentView: View { ("home.open", "Show saved threads", !showHome), ("home.close", "Return to notebook", showHome), ("help.open", "Open help", !showHelp), ("help.close", "Close help", showHelp), ("composer.set", "Set message draft", true), ("composer.clear", "Clear message draft", true), - ("composer.send", "Send message; may run inference and publish", session.signedIn && !session.busy && !draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty), + ("composer.send", "Send message; may run inference and publish", session.canStartTurn && !draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty), ("turn.stop", "Stop current turn", session.busy), + ("turn.reconnect", "Check current host turn without resending it", session.hostOperationID != nil && !session.busy), ("session.retry", "Restore failed session", session.fatal != nil), ("session.new", "Start a blank piece", !session.busy), ("session.resume", "Resume a saved thread", !session.busy), ("preview.expand", "Expand preview", previewVisible && !expandedPreview), @@ -497,6 +499,11 @@ struct ContentView: View { "title": ["opacity": 1, "linked": titleURL != nil], "footer": "v\(session.currentRevision)", "session": ["id": session.currentSessionID, "busy": session.busy, "status": session.status, "signedIn": session.signedIn, "entryCount": session.entries.count, "history": session.history.map { ["id": $0.id, "title": $0.title, "route": $0.route] }], + "provider": ["selected": session.provider, "ready": session.providerReady, + "model": session.model, "reportedModel": session.reportedModel, + "operationID": session.hostOperationID ?? "", + "choices": session.providers.map { ["id": $0.id, "available": $0.available, "notice": $0.notice] }, + "models": session.modelChoices.map { ["id": $0.id, "title": $0.title] }], "preview": ["visible": previewVisible, "expanded": expandedPreview, "width": previewBounds.width, "height": previewBounds.height, "right": previewBounds.right, "top": previewBounds.top], "layout": ["uiScale": uiScale, "compact": compact, "width": sheetSize.width, "height": sheetSize.height, "row": row, "paperTop": paperTop, "previewBlockHeight": previewBlockHeight, "composerHeight": composerHeight], "notebook": ["visible": !expandedPreview && !showHome && !showSettings && !showHelp && !session.showSignIn], @@ -521,6 +528,7 @@ struct ContentView: View { case "composer.clear": draft = "" case "composer.send": send() case "turn.stop": host.stop() + case "turn.reconnect": host.resumeHostTurn() case "session.retry": host.restore() case "session.new": host.newSession(medium: "piece"); showHome = false case "session.resume": diff --git a/apple/aesel/Sources/Session.swift b/apple/aesel/Sources/Session.swift index 3e961b4fa6..2bb2787b06 100644 --- a/apple/aesel/Sources/Session.swift +++ b/apple/aesel/Sources/Session.swift @@ -85,6 +85,10 @@ final class Session { var approval: ProviderApproval? var hostOperationID: String? var providerNotice: String { providers.first { $0.id == provider }?.notice ?? "" } + var providerReady: Bool { + provider == "ac" ? signedIn : providers.contains { $0.id == provider && $0.available } + } + var canStartTurn: Bool { providerReady && !busy && hostOperationID == nil && fatal == nil } var reportedModel = "" var currentThreadID = "" var currentSessionID: String { currentThreadID } diff --git a/apple/aesel/Tests/ProviderReadinessChecks.swift b/apple/aesel/Tests/ProviderReadinessChecks.swift new file mode 100644 index 0000000000..a9fbf0890a --- /dev/null +++ b/apple/aesel/Tests/ProviderReadinessChecks.swift @@ -0,0 +1,35 @@ +import Foundation + +@main struct ProviderReadinessChecks { + static func main() { + let session = Session() + precondition(!session.canStartTurn) + session.signedIn = true + precondition(session.canStartTurn) + session.signedIn = false + for provider in ["claude", "codex"] { + session.receive(["type": "providers", "selected": provider, + "choices": [["id": provider, "available": true]]]) + precondition(session.canStartTurn, "Local providers do not require AC login") + session.busy = true + precondition(!session.canStartTurn) + session.busy = false + session.receive(["type": "hostOperation", "operation": ["id": "pending"]]) + precondition(!session.canStartTurn, "Resolve the previous operation before another Send") + session.receive(["type": "hostOperation"]) + precondition(session.canStartTurn) + session.fatal = "Host page failed" + precondition(!session.canStartTurn) + session.fatal = nil + session.receive(["type": "providers", "selected": provider, + "choices": [["id": provider, "available": false]]]) + precondition(!session.canStartTurn && session.provider == provider) + session.signedIn = true + precondition(!session.canStartTurn, "AC login cannot substitute for a disconnected provider") + session.signedIn = false + } + session.provider = "unknown" + precondition(!session.canStartTurn) + print("Provider readiness preserves AC sign-in, local-provider independence, and pending-turn recovery.") + } +} diff --git a/easel/phone/session.mjs b/easel/phone/session.mjs index 91d9dab890..79f53f7c90 100644 --- a/easel/phone/session.mjs +++ b/easel/phone/session.mjs @@ -536,7 +536,10 @@ export function createSession({ storage = memoryStore(), emit = () => {}, hostRP } if (!text.trim() || state.busy) return; if (state.hostOperation) throw new Error("Reconnect to resolve the previous host turn before sending another request."); - if (!state.token) { say("bad", { text: "Sign in to AC to make a piece." }); return; } + if (state.provider === "ac" && !state.token) { say("bad", { text: "Sign in to AC to make a piece." }); return; } + if (state.provider !== "ac" && !hostProviders.some(p => p.id === state.provider && p.available)) { + say("bad", { text: "This provider is not connected. Refresh the connection in Settings." }); return; + } if (!state.title || state.title === state.slug) state.title = text.trim().slice(0, 120); say("you", { text }); state.busy = true; diff --git a/easel/test/phone-session.test.mjs b/easel/test/phone-session.test.mjs index 70eae65706..88c18db683 100644 --- a/easel/test/phone-session.test.mjs +++ b/easel/test/phone-session.test.mjs @@ -201,3 +201,48 @@ test('piece revision starts at zero, counts changed source, and survives thread assert.equal(events.filter(e=>e.type==='piece').at(-1).version,1); } finally {globalThis.fetch=originalFetch;} }); + +test('connected Claude and Codex update signed-out drafts without AC inference or publication', async () => { + const originalFetch = globalThis.fetch; + const network = []; + const previousGuides = globalThis.__aeselGuides; + globalThis.__aeselGuides = Object.fromEntries(['pieces.md','screen.md','hand.md','kidlisp.md','api.json'].map(name=>['/easel/context/'+name,'fixture guide'])); + globalThis.fetch = async url => { network.push(url); throw new Error('Unexpected AC request'); }; + try { + for (const provider of ['claude', 'codex']) { + const events = [], calls = []; + let available = true; + const source = 'export function paint({wipe}) { wipe("purple") }'; + const hostRPC = async (method, params) => { + calls.push({method, params}); + if (method === 'capabilities') return {providers: [{id:provider, available, models:[{id:'',title:'CLI default'}]}]}; + if (method === 'configure') return {sequence:0}; + if (method === 'turn') return {id:params.operationID,status:'running'}; + if (method === 'events') return { + oldest:1, events:[{sequence:1,operation:params.operationID,type:'source',source}], + operation:{id:params.operationID,status:'completed'}, approvals:[] + }; + throw new Error(`Unexpected RPC: ${method}`); + }; + const session = createSession({hostRPC,emit:e=>events.push(e)}); + await session.begin(); await session.open(); await session.refreshProviders(); session.setProvider(provider); + assert.equal(session.state.token, ''); + await session.ask('Make purple'); + assert.equal(calls.filter(c=>c.method==='turn').length, 1); + assert.equal(calls.find(c=>c.method==='configure').params.provider, provider); + assert.equal(session.state.revisions.at(-1).source, source); + assert(!session.state.published); + assert.equal(session.state.hostOperation, null); + assert.equal(events.some(e=>e.type==='bad'), false); + available = false; await session.refreshProviders(); + await session.ask('Do not lose this request'); + assert.equal(calls.filter(c=>c.method==='turn').length, 1); + assert.equal(session.state.provider, provider); + assert(events.some(e=>e.type==='bad' && e.text.includes('not connected'))); + session.setProvider('ac'); + await session.ask('AC still needs login'); + assert(events.some(e=>e.type==='bad' && e.text.includes('Sign in to AC'))); + } + assert.deepEqual(network, []); + } finally { globalThis.fetch = originalFetch; globalThis.__aeselGuides = previousGuides; } +}); diff --git a/slab/AESEL-EYE.md b/slab/AESEL-EYE.md index b948975464..fbb63b01dd 100644 --- a/slab/AESEL-EYE.md +++ b/slab/AESEL-EYE.md @@ -12,6 +12,8 @@ This workflow extends [the papers gate](../papers/aesthetic-eye.mjs) to an inter surface and overlays. Disabled or unported features remain explicit. 3. Exercise the affected controls with `aesel_act`, then read `aesel_state` and `aesel_events`. An accepted action can still have asynchronous work pending. + Pass the observed `session.id` as `expectedSessionID` on every action. A + thread switch invalidates that observation; inspect again before continuing. 4. Capture notebook, settings, expanded preview and narrow notebook. Add loading, failure, account or other states whenever the change affects them. 5. Inspect each image at its intended size. Review type, contrast, spacing, @@ -71,6 +73,18 @@ from the everyday app. This is especially useful with the existing debug notebook fixture; fixture tests do not demonstrate account, inference or purchase success. Physical-device transport and whole-window iOS capture are not provided. +State includes the selected provider, its availability, model catalog and pending +operation ID. `provider.select` takes `provider`, `model.select` takes `model` +(an empty string selects CLI default), and `turn.reconnect` checks the existing +operation without resending it. `ui.scale` takes `scale`; `preview.resize` takes +`width` and `height`. The native action validates each control's bounds. + +For signed-out provider UI checks, the debug notebook fixture accepts +`AESEL_PREVIEW_PROVIDER=claude` or `codex`. This supplies test readiness only; +it does not connect a CLI or prove inference. Both fixtures use the stable +`notebook-preview` thread ID. Shared-session tests separately exercise source +updates through a fake provider and assert that no AC request is made. + Diagnostics record event names and timestamps, not prompts, tokens, source or bridge payloads. State inspection includes visible piece/thread metadata. Screenshots can contain whatever the user has displayed; capture only for an diff --git a/slab/bin/aesel-mcp.mjs b/slab/bin/aesel-mcp.mjs index a20374f118..a3c043edee 100644 --- a/slab/bin/aesel-mcp.mjs +++ b/slab/bin/aesel-mcp.mjs @@ -11,6 +11,9 @@ export const DEFAULT_DIRECTORY = join(homedir(), 'Library/Containers/computer.ae const pause = ms => new Promise(resolve => setTimeout(resolve, ms)); export async function request(method, params = {}, options = {}) { + if (method === 'action' && (typeof params.expectedSessionID !== 'string' || !params.expectedSessionID.trim())) { + throw new Error('expectedSessionID is required; read aesel_state and use session.id before acting'); + } const directory = options.directory || process.env.AESEL_AUTOMATION_DIR || DEFAULT_DIRECTORY; const metadata = await lstat(directory).catch(() => { throw new Error('Aesel automation is unavailable. Start an MCP-enabled Aesel Native build; this tool never opens or focuses the app.'); }); if (!metadata.isDirectory() || metadata.isSymbolicLink() || (metadata.mode & 0o077) || metadata.uid !== process.getuid()) throw new Error('Automation directory must be private and owned by the current user'); @@ -48,7 +51,16 @@ const object = properties => ({ type: 'object', properties, additionalProperties export const TOOLS = [ { name: 'aesel_map', description: 'Map the running native app: stable control IDs, enabled states, visible screen and overlays. Unsupported features remain explicitly disabled. Does not activate the app.', inputSchema: object({}), annotations: {readOnlyHint: true} }, { name: 'aesel_state', description: 'Read Aesel UI and session state, piece revision, preview URL/query flags, draft length and saved-thread metadata. Does not return tokens, transcript text or source.', inputSchema: object({}), annotations: {readOnlyHint: true} }, - { name: 'aesel_act', description: 'Operate a named enabled control from aesel_map. composer.set accepts text; session.resume accepts sessionId; window.resize accepts width/height. Send can consume inference credits and auto-publish; piece.publish writes publicly; credits.buy opens App Store confirmation; piece.open opens a browser. Use only when that specific action is authorized. Returns acceptance and observed UI state; async work may still be pending. Never focuses the main app.', inputSchema: { ...object({ id: {type:'string'}, text: {type:'string',maxLength:32768}, sessionId: {type:'string'}, width:{type:'number',minimum:360,maximum:2400},height:{type:'number',minimum:420,maximum:1800} }), required:['id'] }, annotations: {readOnlyHint:false, destructiveHint:true, openWorldHint:true} }, + { name: 'aesel_act', + description: 'Operate a named enabled control from aesel_map. First read aesel_state; pass its session.id as expectedSessionID. composer.set accepts text; session.resume accepts sessionId; provider.select accepts provider; model.select accepts model (empty string means CLI default); ui.scale accepts scale; window.resize and preview.resize accept width/height. turn.reconnect checks an existing turn without resending it. Send can consume provider usage or AC credits and auto-publish; piece.publish writes publicly; credits.buy opens App Store confirmation; piece.open opens a browser. Use only when that specific action is authorized. Returns acceptance and observed state; async work may still be pending. Never focuses the main app.', + inputSchema: { ...object({ + id: {type:'string'}, expectedSessionID: {type:'string',minLength:1}, + text: {type:'string',maxLength:32768}, sessionId: {type:'string'}, + provider: {type:'string',enum:['ac','claude','codex']}, model: {type:'string'}, + scale: {type:'number',minimum:0.7,maximum:1.75}, + width: {type:'number',minimum:96,maximum:2400}, height: {type:'number',minimum:72,maximum:1800} + }), required:['id','expectedSessionID'] }, + annotations: {readOnlyHint:false, destructiveHint:true, openWorldHint:true} }, { name: 'aesel_events', description: 'Read the bounded local diagnostic event ring after a sequence number. Event kinds and timestamps only; no prompt, source, token or raw bridge payload. No analytics export.', inputSchema: object({after:{type:'integer',minimum:0}}), annotations:{readOnlyHint:true} }, { name: 'aesel_preview', description: 'Inspect the actual embedded WebKit URL, query flags, runtime readiness and canvas dimensions. No arbitrary JavaScript execution.', inputSchema: object({}), annotations:{readOnlyHint:true} }, { name: 'aesel_capture', description: 'Capture native app chrome, notebook WebKit, or preview WebKit without focusing or opening a window. Capture each visible surface for acceptance. Optional window capture requires existing Screen Recording permission and never requests it. Captures can contain visible user content.', inputSchema: object({target:{type:'string',enum:['app','notebook','preview','window'],default:'app'}}), annotations:{readOnlyHint:true} }, diff --git a/slab/test/aesel-mcp.test.mjs b/slab/test/aesel-mcp.test.mjs index 29487d0dcc..abc7f4c197 100644 --- a/slab/test/aesel-mcp.test.mjs +++ b/slab/test/aesel-mcp.test.mjs @@ -61,3 +61,33 @@ test('Aesthetic Eye fails absent scenarios, unreviewed images, changed evidence, await writeFile(join(bundle,'code'),'build2');assert((await check(dir)).errors.some(e=>e.includes('Stale build'))); }finally{await rm(dir,{recursive:true,force:true});} }); + +test('MCP actions advertise and transmit the observed thread and new native control arguments', async () => { + const reply = await handleMessage({id:1,method:'tools/list'}); + const schema = reply.result.tools.find(tool=>tool.name==='aesel_act').inputSchema; + assert(schema.required.includes('expectedSessionID')); + for (const name of ['provider','model','scale','width','height']) assert(schema.properties[name]); + await assert.rejects(request('action',{id:'settings.open'}), /expectedSessionID/); + const dir = await mkdtemp(join(tmpdir(),'aesel-action-')); + await chmod(dir,0o700); await mkdir(join(dir,'requests')); await mkdir(join(dir,'responses')); + await writeFile(join(dir,'instance.json'),JSON.stringify({schema:1,pid:process.pid,instance:'fixture'})); + const previous = process.env.AESEL_AUTOMATION_DIR; + process.env.AESEL_AUTOMATION_DIR = dir; + try { + const args = {id:'provider.select',expectedSessionID:'observed-thread',provider:'codex'}; + const pending = handleMessage({id:2,method:'tools/call',params:{name:'aesel_act',arguments:args}}); + let file; + for(let i=0;i<40&&!file;i++) { file=(await readdir(join(dir,'requests'))).find(n=>n.endsWith('.json')); if(!file) await new Promise(r=>setTimeout(r,10)); } + const input = JSON.parse(await readFile(join(dir,'requests',file),'utf8')); + assert.equal(input.method,'action'); assert.deepEqual(input.params,args); + // The native guard must still see the caller's observation, even when stale. + await writeFile(join(dir,'responses',file),JSON.stringify({id:input.id,error:'Stale or missing expectedSessionID; inspect state before acting'})); + const result = await pending; + assert.equal(result.result.isError,true); + assert.match(result.result.content[0].text,/Stale/); + } finally { + if(previous === undefined) delete process.env.AESEL_AUTOMATION_DIR; + else process.env.AESEL_AUTOMATION_DIR = previous; + await rm(dir,{recursive:true,force:true}); + } +});