From 47c80f2bffea15c0e24200700e4caa59653ad47b Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 28 Sep 2026 16:52:55 +0800 Subject: [PATCH 001/132] =?UTF-8?q?fix:=20byg=20paa=20macos-15,=20aerlige?= =?UTF-8?q?=20forgrunds-loefter,=20fremmed-mac=20som=20=C3=A6gte=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ci/release/udgiv-npm: macos-14 -> macos-15 (SCRecordingOutput mangler i 14-SDK, CI rød på main) - README + vejledning: fjern 'nothing comes to the front'; sig at forgrunden gives tilbage - menu-needs-front: 'may be' i stedet for påstået årsag; peg ikke paa en vej der afvises bagfra - brugsscenarier: skærm taget (selv med tilbagegivning) = 'delvist', ikke 'bevist' (MANDAT) - fremmed-mac: samlende port fejler jobbet hvis suite/mutant/scenarier ikke bestod Co-Authored-By: Claude Opus 4.8 --- .github/workflows/ci.yml | 2 +- .github/workflows/fremmed-mac.yml | 22 ++++++++++++++++++++++ .github/workflows/release.yml | 2 +- .github/workflows/udgiv-npm.yml | 2 +- README.md | 5 +++-- mcp-server/index.js | 9 +++++---- test/brugsscenarier.mjs | 5 ++++- 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9197a272..762a3738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: build-and-test: # macOS-koerer. Der findes ingen anden slags: hele produktet er bygget paa # macOS' egne rammevaerker. - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/fremmed-mac.yml b/.github/workflows/fremmed-mac.yml index 7796c39f..9177a133 100644 --- a/.github/workflows/fremmed-mac.yml +++ b/.github/workflows/fremmed-mac.yml @@ -59,6 +59,7 @@ jobs: mcp-server/vendor/cmcp-helper focused || true - name: Hele suiten + id: suite continue-on-error: true run: | export TMPDIR="$RUNNER_TEMP/" @@ -69,6 +70,7 @@ jobs: exit $rc - name: Mutationsbevis for giv-tilbage (proeven tager forgrunden, saa kun her) + id: mutant continue-on-error: true run: bash .github/mutant-giv-tilbage.sh @@ -83,6 +85,7 @@ jobs: mcp-server/vendor/cmcp-helper focused || true - name: Brugsscenarierne i baggrunden + id: bg continue-on-error: true run: CMCP_BRUG=laes,lokal,kamera CMCP_BRUG_RAPPORT="$RUNNER_TEMP/baggrund.json" node test/brugsscenarier.mjs @@ -98,6 +101,7 @@ jobs: sleep 2 - name: Brugsscenarierne i forgrunden + id: fg continue-on-error: true run: CMCP_BRUG=laes,lokal,kamera CMCP_BRUG_TILSTAND=forgrund CMCP_BRUG_TAG_SKAERMEN=1 CMCP_BRUG_RAPPORT="$RUNNER_TEMP/forgrund.json" node test/brugsscenarier.mjs @@ -115,3 +119,21 @@ jobs: ${{ runner.temp }}/baggrund.json ${{ runner.temp }}/forgrund.json ${{ runner.temp }}/diag/ + + # ⛔ 28/9: foer var suite, mutant og de to scenarie-koersler alle + # continue-on-error uden en samlende port - en groen koersel beviste + # intet om proeverne. Nu fejler jobbet, hvis en af dem ikke bestod. + # (Beviserne uploades ovenfor med if: always, saa de findes stadig.) + - name: Porten - en fejlet proeve goer hele jobbet roedt + if: always() + run: | + fail=0 + for par in "Suiten:${{ steps.suite.outcome }}" \ + "Mutationsbeviset:${{ steps.mutant.outcome }}" \ + "Baggrunds-scenarier:${{ steps.bg.outcome }}" \ + "Forgrunds-scenarier:${{ steps.fg.outcome }}"; do + navn="${par%%:*}"; res="${par##*:}" + echo "$navn: $res" + [ "$res" = "success" ] || { echo "⛔ $navn bestod ikke ($res)"; fail=1; } + done + [ "$fail" = "0" ] && echo "Alle fire porte grønne." || exit 1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32b6f897..e2bfcaa9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ permissions: jobs: universal: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/udgiv-npm.yml b/.github/workflows/udgiv-npm.yml index 605da7cc..b96ac775 100644 --- a/.github/workflows/udgiv-npm.yml +++ b/.github/workflows/udgiv-npm.yml @@ -47,7 +47,7 @@ jobs: udgiv: # macOS fordi build-release.sh bygger den universelle Swift-binaer # (arm64 + x86_64) der ligger i pakken. En Linux-koerer kan ikke. - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index e0eb6728..ebe09e0e 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ in the hours you are not watching. - **It does not take over your Mac.** It presses buttons and fills fields in windows that stay behind the one you are in, and it leaves your pointer where - you put it. Nothing gets minimised, nothing comes to the front, nothing steals - what you are typing. + you put it. When an app pulls itself to the front as it opens, the front is + handed straight back and the reply says so - nothing is left stealing what you + are typing. - **It does not pretend.** When something is refused or fails, it says so and says why. The most common complaint about agents driving a computer is that they carry on as if it worked. diff --git a/mcp-server/index.js b/mcp-server/index.js index d0809802..475ff1ec 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -176,10 +176,11 @@ When a step did nothing - the next route (measured 27-28 Sep): - \`computer_press\` said ok and nothing changed (a sidebar in App Store or System Settings): the app ignores presses there from behind. Find the same action in its menus with \`computer_menus\` - System Settings has every page under View. -- A menu item is greyed out, code \`menu-needs-front\`: the app only allows it - while it is in front. Ask the person to bring it forward, then call again. +- A menu item is greyed out, code \`menu-needs-front\`: this may be because the + app only enables it while it is in front - which cannot be done from behind. + Tell the person and let them bring it forward; do not keep pressing it. - The app runs but has no window: \`computer_launch\` with \`background: true\` - asks it to show one, without bringing it forward. + asks it to show one; if the app pulls itself forward the front is handed back. - Nothing is found in an app you just saw: check \`computer_windows\` - the window may have been closed. - Whichever it was, write it down with \`computer_learning\`: the route that @@ -1075,7 +1076,7 @@ async function haandterKald(request) { `so the person would see it happen.\n\n` + `Set \`${MANGLER_FOR_STILLE[name]}\` and call it again. ` + `The event then goes into that app's own queue: the pointer stays where ` + - `the person left it, nothing comes to the front, and it works on a window ` + + `the person left it, this call pulls nothing to the front, and it works on a window ` + `behind the one they are in.\n` + `Use computer_apps or computer_windows if you are unsure of the name.` ); diff --git a/test/brugsscenarier.mjs b/test/brugsscenarier.mjs index 689ce4d7..4559f9d5 100644 --- a/test/brugsscenarier.mjs +++ b/test/brugsscenarier.mjs @@ -484,7 +484,10 @@ export async function koerScenarie(s, { forgrund = false } = {}) { res.status = 'fejlede'; res.bevis = `tog skærmen og gav den ikke tilbage: ${beholdt.map(t => `${t.navn} (${t.hvorfor.slice(0, 80)})`).join('; ')} · ${res.bevis}`; } else if (tog.length) { - res.bevis += ` · ${tog.length}x hentede et program sig selv frem, forgrunden blev givet straks tilbage`; + // MANDAT: at tage skærmen og give den tilbage er stadig at tage skærmen. + // Genopretning er bedre end intet, men den gør ikke et forløb til baggrund. + res.status = 'delvist'; + res.bevis += ` · ${tog.length}x hentede et program sig selv frem (skærmen taget, forgrunden givet straks tilbage) - ikke rent baggrundsforløb`; } } catch (e) { res.status = e instanceof KunForgrund ? 'delvist' : 'fejlede'; From dcf361ab2dc89358bc5e54746ef5aa6a1acc98b0 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 28 Sep 2026 18:56:11 +0800 Subject: [PATCH 002/132] =?UTF-8?q?vejledning:=20sp=C3=B8rg=20n=C3=A5r=20d?= =?UTF-8?q?u=20er=20blokeret,=20giv=20ikke=20op=20-=20tre=20ting=20er=20me?= =?UTF-8?q?nneskets=20at=20give?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gustav 28/9: modellen skal vide den kan alt et menneske kan, og enten finde vejen eller spørge (computer_ask_user) frem for at stoppe. Login/kodeord, afsendelse til et rigtigt menneske, og forgrund er menneskets; aldrig taste kodeord, aldrig omgå en afvisning. Co-Authored-By: Claude Opus 4.8 --- mcp-server/index.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mcp-server/index.js b/mcp-server/index.js index 475ff1ec..05b562ed 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -194,9 +194,16 @@ What you will be refused, and why: - an unredacted screenshot: that is the person's decision, never the model's - the Computer MCP status icon itself: it is their control surface -When something needs a human, the question waits in the menu bar icon and the -person answers it with Touch ID. You are told the action did not happen; call -it again after they approve. \`computer_pending\` lists what is waiting. +When something needs a human, do not give up - ask. This tool can drive anything +on the Mac a person can reach by hand; three things stay theirs to give: a login +or password, the go-ahead to send a message to a real person, and bringing an app +to the front for something that only works there. When you need one of these, call +\`computer_ask_user\`: the question waits in the menu bar icon and the person answers +with Touch ID and types any secret themselves - you never type a password and never +see it. You are told the action did not happen; call it again after they approve. +\`computer_pending\` lists what is waiting. Handing back "I can't" before you have +asked is the one wrong move; when in doubt whether you may do something, ask whether +to do it - and never work around a refusal. Reading: \`computer_inspect\` answers as text by default. If it says INCOMPLETE or [cut: ...], the answer is PART of the tree - narrow it with \`computer_find\` From 6a5868f846b856f2a88a8ebeb27a2082de01a0da Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 28 Sep 2026 19:25:29 +0800 Subject: [PATCH 003/132] docs: regenerer npm-README efter forgrunds-loefte-rettelsen (holder claim 45 groen) Co-Authored-By: Claude Opus 5.5 --- mcp-server/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mcp-server/README.md b/mcp-server/README.md index 71f86584..fa68dd91 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -7,8 +7,9 @@ in the hours you are not watching. - **It does not take over your Mac.** It presses buttons and fills fields in windows that stay behind the one you are in, and it leaves your pointer where - you put it. Nothing gets minimised, nothing comes to the front, nothing steals - what you are typing. + you put it. When an app pulls itself to the front as it opens, the front is + handed straight back and the reply says so - nothing is left stealing what you + are typing. - **It does not pretend.** When something is refused or fails, it says so and says why. The most common complaint about agents driving a computer is that they carry on as if it worked. From d1c5cfe8a7c38c0c9a77ce3ba970a4b9609710fa Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 28 Sep 2026 20:41:51 +0800 Subject: [PATCH 004/132] haerdning M1: programlaasen fejler LUKKET ved infra-fejl (ikke aaben) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fandt af batch-2-hærdningen (29 bekræftede huller): programlaas.js:45 kørte handlingen alligevel ved enhver ikke-EEXIST låsefejl (ENOTDIR/EACCES). To agenter kunne skrive i flæng i samme program - netop det låsen skal forhindre. Nu: kan låsen ikke tages, sker handlingen ikke, med en ærlig grund (infra, ikke contention). Prøve test/laas-fejler-lukket.mjs tvinger ENOTDIR frem; revert af M1 gør den rød. Co-Authored-By: Claude Opus 5.5 --- mcp-server/index.js | 6 ++++-- mcp-server/programlaas.js | 6 +++++- test/laas-fejler-lukket.mjs | 40 +++++++++++++++++++++++++++++++++++++ test/run-all.sh | 1 + 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 test/laas-fejler-lukket.mjs diff --git a/mcp-server/index.js b/mcp-server/index.js index 05b562ed..97ff0593 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -1288,9 +1288,11 @@ async function haandterKald(request) { return errorResult(`Refused: ${stopgrund}. Nothing was done. Call it again.`); } if (!laast.ok) { - const grund = `another agent is working in ${targetBundleId || 'the foreground app'} right now`; + // laast.grund er sat naar laasen fejlede LUKKET paa en infra-fejl (M1); + // ellers er det ventetiden der udloeb (en anden agent holdt laasen). + const grund = laast.grund || `another agent is working in ${targetBundleId || 'the foreground app'} right now, and it did not finish within a minute`; record({ tool: name, outcome: 'refused', reason: grund }); - return errorResult(`Refused: ${grund}, and it did not finish within a minute. Nothing was done. Try again shortly.`); + return errorResult(`Refused: ${grund}. Nothing was done. Try again shortly.`); } result = laast.vaerdi; } diff --git a/mcp-server/programlaas.js b/mcp-server/programlaas.js index b12aee16..6df83fb2 100644 --- a/mcp-server/programlaas.js +++ b/mcp-server/programlaas.js @@ -42,7 +42,11 @@ export async function medProgramLaas(program, fn, maksVentMs = 60_000) { try { writeSync(fd, String(process.pid)); } finally { closeSync(fd); } break; } catch (err) { - if (err.code !== 'EEXIST') return { ok: true, vaerdi: await fn() }; // kan ikke laase: gaa videre som foer + // ⛔ 28/9 (haerdning M1): FOER kørte vi fn() alligevel her (fail-open) - en + // laase-infra-fejl (ENOTDIR hvis laase-mappen bliver en fil, EACCES m.fl.) + // lod to agenter skrive i flaeng, netop dét laasen skal forhindre. Nu + // fejler laasen LUKKET: kan handlingen ikke serialiseres, sker den ikke. + if (err.code !== 'EEXIST') return { ok: false, grund: `the per-app lock could not be taken (${err.code || 'unknown error'}); an action that cannot be serialised does not happen` }; if (!ejerLever(sti)) { try { unlinkSync(sti); } catch {} continue; } if (Date.now() - start > maksVentMs) return { ok: false }; await sov(40); diff --git a/test/laas-fejler-lukket.mjs b/test/laas-fejler-lukket.mjs new file mode 100644 index 00000000..15332563 --- /dev/null +++ b/test/laas-fejler-lukket.mjs @@ -0,0 +1,40 @@ +// M1 (28/9): programlåsen fejler LUKKET ved en infra-fejl. +// +// ⛔ HVORFOR DEN FINDES +// programlaas.js:45 kørte FØR handlingen alligevel (fail-open), hvis låsen +// ikke kunne tages af en anden grund end "optaget" (EEXIST). En låse-mappe +// der bliver en fil giver ENOTDIR - og så skrev to agenter i flæng i samme +// program, netop det låsen skal forhindre. Prøven tvinger ENOTDIR frem og +// kræver, at handlingen AFVISES (ok:false), ikke udføres. +import { mkdtempSync, writeFileSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; + +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +// Gør 'laase'-stien til en FIL, så openSync inde i den giver ENOTDIR (ikke EEXIST). +const base = mkdtempSync(join(tmpdir(), 'cmcp-laas-')); +writeFileSync(join(base, 'laase'), 'jeg er en fil, ikke en mappe'); +process.env.CMCP_STATE_DIR = base; + +// DIR læses ved modul-load fra env, så env SKAL sættes før import. +const { medProgramLaas } = await import('../mcp-server/programlaas.js'); + +let kørt = false; +const r = await medProgramLaas('com.apple.TextEdit', async () => { kørt = true; return 'skulle-ikke-ske'; }); + +check('1 laasen fejler LUKKET (ok:false), ikke aaben', r.ok === false, JSON.stringify(r)); +check('2 handlingen blev IKKE udfoert', kørt === false); +check('3 afslaget siger hvorfor (infra, ikke contention)', /could not be taken|serialised/.test(r.grund || ''), r.grund); + +// Kontrol: en ren mappe låser og kører handlingen som normalt. +const base2 = mkdtempSync(join(tmpdir(), 'cmcp-laas-ok-')); +process.env.CMCP_STATE_DIR = base2; +const { medProgramLaas: laas2 } = await import('../mcp-server/programlaas.js?ren'); +let kørt2 = false; +const r2 = await laas2('com.apple.TextEdit', async () => { kørt2 = true; return 42; }); +check('4 en ren mappe laaser og koerer handlingen', r2.ok === true && r2.vaerdi === 42 && kørt2 === true, JSON.stringify(r2)); + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/run-all.sh b/test/run-all.sh index df3e1ed1..2b36940a 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -92,6 +92,7 @@ run "paastande" "node test/claims.mjs" # og den var dermed ubevist i naesten hver koersel. Nu gaar spoergsmaalet # gennem en attrap, saa den koerer HVER gang og viser ingenting. run "fejl-lukket" "node test/failclosed.mjs" +run "laas fejler lukket" "node test/laas-fejler-lukket.mjs" run "fejlbeskeder" "node test/errors.mjs" run "flere agenter" "node test/concurrent.mjs" From b5d0953d3f1b39d7fbdd73666347298a0580df86 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 28 Sep 2026 23:44:19 +0800 Subject: [PATCH 005/132] haerdning M4: giv aldrig forgrunden fra et menneske der lige skiftede MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fandt af batch-2-review'et: givTilbage() gav forgrunden tilbage naar maalprogrammet kom frem UANSET nyligt menneske-input - klikkede mennesket selv over i dét program, rev vi det tilbage. Nu gaelder menneske-tjekket i alle grene, og et forgrunds-skift vi lader staa rapporteres aerligt (took_screen:true, gave_back:false) i stedet for et tavst false. Paa en maskine uden menneske (køreren) er adfaerden uaendret, saa giv-tilbage-mutanten verificerer fortsat. Co-Authored-By: Claude Opus 4.8 --- helper/Sources/cmcp-helper/Skaerm.swift | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/helper/Sources/cmcp-helper/Skaerm.swift b/helper/Sources/cmcp-helper/Skaerm.swift index 63b76090..470eece8 100644 --- a/helper/Sources/cmcp-helper/Skaerm.swift +++ b/helper/Sources/cmcp-helper/Skaerm.swift @@ -187,10 +187,19 @@ enum Skaerm { // trykker en tast eller klikker; et program der skubber sig frem, goer // ingen af delene. Uden menneskelig input i 1,5 s var det ikke mennesket. let maal = tilPid() - guard maal != foer.forrestPid, efter.forrestPid == maal || !menneskeRoerteNetop() else { - return ["took_screen": false, + // Maalet er der mennesket allerede var: intet skift at give tilbage. + if maal == foer.forrestPid { return ["took_screen": false] } + // ⛔ 28/9 (haerdning M4): FOER stod `efter.forrestPid == maal || !menneskeRoerteNetop()` + // - naar maalprogrammet kom frem, blev forgrunden givet tilbage UANSET om + // mennesket lige havde klikket/tastet. Klikkede mennesket selv over i netop + // dét program, rev vi det tilbage under haenderne paa dem. Nu gaelder + // menneske-tjekket i ALLE grene: har nogen roert tastatur eller mus lige + // foer, saa lader vi forgrunden staa - og siger aerligt at skaermen skiftede, + // i stedet for et tavst took_screen:false. + if menneskeRoerteNetop() { + return ["took_screen": true, "gave_back": false, "observed": ["frontmost_changed_to": efter.forrestNavn, - "note": "someone pressed a key or clicked just before, so this is taken to be the person switching - left alone"]] + "note": "a person clicked or typed just before, so this is taken to be them and the front was left with \(efter.forrestNavn)"]] } NSRunningApplication(processIdentifier: foer.forrestPid)?.activate(options: []) var tilbage = false From 4f9c98c3cdbb8fdc06b85963114750c6e3cff76d Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 29 Sep 2026 00:01:58 +0800 Subject: [PATCH 006/132] test(mutant): opdater M4-mutanten til den nye give-tilbage-kode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit M4-ændringen fjernede den linje den gamle mutant patchede (efter.forrestPid==maal || !menneskeRoerteNetop()), saa mutanten kunne ikke anvendes og 'overlevede' falsk. Ny mutant: faa menneske-tjekket til altid at fyre -> forgrunden gives aldrig tilbage -> proeven bliver roed. Beviser M4's invariant paa en maskine uden menneske. Co-Authored-By: Claude Opus 5.5 --- .github/mutant-giv-tilbage.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/mutant-giv-tilbage.sh b/.github/mutant-giv-tilbage.sh index a181830d..f89daf10 100644 --- a/.github/mutant-giv-tilbage.sh +++ b/.github/mutant-giv-tilbage.sh @@ -27,6 +27,9 @@ mut M1-giver-ikke-tilbage 'NSRunningApplication(processIdentifier: foer.forrestP mut M2-maaler-ikke 'guard foer.forrestPid > 0, efter.forrestPid != foer.forrestPid else { return ["took_screen": false] }' 'return ["took_screen": false]' # M3: launch giver ikke forgrunden tilbage (main.swift) MUT_FIL=main.swift mut M3-launch-giver-ikke-tilbage 'if (g["took_screen"] as? Bool) == true { for (k, v) in g { ls[k] = v } }' 'if false { for (k, v) in g { ls[k] = v } }' -# M4: kun et skift til maalprogrammet gives tilbage (reglen foer koersel 10) -mut M4-kun-maalprogrammet 'efter.forrestPid == maal || !menneskeRoerteNetop()' 'efter.forrestPid == maal' +# M4 (28/9): menneske-tjekket maa ikke spurioest blokere give-tilbage. Paa en +# maskine UDEN menneske skal forgrunden stadig gives tilbage - saa hvis nogen +# faar menneske-grenen til altid at fyre (og dermed altid lade forgrunden staa), +# SKAL proeven blive roed. +mut M4-menneske-tjek-blokerer 'if menneskeRoerteNetop() {' 'if true {' exit $fejl From c06305810731299382c49d9dba2f4ff289b96112 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 29 Sep 2026 00:29:33 +0800 Subject: [PATCH 007/132] doer (slice 1): computer_open - aabn en apps egen indgang bagfra, sikkert Baggrunds-doeren fra batch-2-spec'en, foerste skive. Modellen giver et intent (open_app/play_track/open_chat) + EN typet parameter, ALDRIG en URL - serveren bygger en fast app-URL og validerer parameteren strengt (kun cifre/bogstaver). Helperen aabner den med NSWorkspace .withoutActivation og dobbelt-tjekker mod en haardkodet scheme-allowlist (spotify/whatsapp/claude). Doeren navngiver sit maal via intent'et, saa porten ikke kalder den 'ukendt maal'. Baerer navigation, ALDRIG et send. test/doer.mjs (8 tjek) beviser: intet url-felt at injicere i, bad id/phone/bundle/intent afvist, praecis app-URL bygget. Swift-open-url + funktionen verificeres paa hhv. koereren og Gustavs Mac. Co-Authored-By: Claude Opus 4.8 --- helper/Sources/cmcp-helper/main.swift | 26 ++++++++++ mcp-server/index.js | 36 +++++++++++++ mcp-server/tools.js | 16 ++++++ test/doer.mjs | 75 +++++++++++++++++++++++++++ test/run-all.sh | 1 + 5 files changed, 154 insertions(+) create mode 100644 test/doer.mjs diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 3ae96996..899ac87d 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -277,6 +277,32 @@ case "launch": } Out.ok(ls) +case "open-url": + // Doeren: aabn en app's EGEN indgang bagfra (spotify:track:, whatsapp://chat) + // uden at aktivere. Serveren bygger URL'en af en fast skabelon og validerer + // hver parameter; helperen dobbelt-tjekker mod en HAARDKODET scheme-allowlist, + // saa selv en fejl i serveren aldrig kan aabne file:/shortcuts:/osascript. + guard let raw = args.str("url"), let url = URL(string: raw), let scheme = url.scheme?.lowercased() else { + Out.fail("--url is missing or is not a valid URL", code: "bad-args") + } + let tilladteSchemes: Set = ["spotify", "whatsapp", "claude"] + guard tilladteSchemes.contains(scheme) else { + Out.fail("the scheme '\(scheme)' is not one of this door's app schemes (\(tilladteSchemes.sorted().joined(separator: ", ")))", code: "scheme-not-allowed") + } + let foerU = Skaerm.stand() + let cfg = NSWorkspace.OpenConfiguration() + cfg.activates = false + let sem = DispatchSemaphore(value: 0) + var aabenFejl: Error? = nil + NSWorkspace.shared.open(url, configuration: cfg) { _, error in aabenFejl = error; sem.signal() } + _ = sem.wait(timeout: .now() + 10) + if let e = aabenFejl { Out.fail("opening the \(scheme) door failed: \(e.localizedDescription)", code: "open-failed") } + var uu: [String: Any] = ["opened_scheme": scheme] + // Kan hente sig selv frem trods activates:false - giv forgrunden straks tilbage. + let gu = Skaerm.givTilbage(foer: foerU, tilPid: { NSWorkspace.shared.frontmostApplication?.processIdentifier }, ventMs: 4000) + for (k, v) in gu { uu[k] = v } + Out.ok(uu) + case "quit": guard let hvad = args.str("app") else { Out.fail("--app is missing", code: "bad-args") } // ⛔ Den her maaling er ikke pynt. Et program med ugemt arbejde svarer paa diff --git a/mcp-server/index.js b/mcp-server/index.js index 97ff0593..40d83790 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -502,6 +502,32 @@ async function runTool(name, args) { ...(args.background ? ['--background'] : [])]); return medSkaerm(textResult(r), r); } + case 'computer_open': { + // Doeren. Modellen giver et intent + EN parameter, aldrig en URL. Serveren + // bygger URL'en af en fast skabelon og validerer parameteren strengt, saa + // KUN cifre/bogstaver kan passere - ingen injektion, ingen fri scheme. + const intent = String(args.intent || ''); + if (intent === 'open_app') { + const bid = String(args.bundleId || ''); + if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,119}$/.test(bid)) return errorResult('Refused: open_app needs a valid bundle id like com.spotify.client. Nothing was done.'); + const r = await callHelper(['launch', '--app', bid, '--background']); + return medSkaerm(textResult(r), r); + } + let url; + if (intent === 'play_track') { + const id = String(args.spotifyId || ''); + if (!/^[0-9A-Za-z]{22}$/.test(id)) return errorResult('Refused: play_track needs a 22-character Spotify track id (letters and digits only). Nothing was done.'); + url = `spotify:track:${id}`; + } else if (intent === 'open_chat') { + const phone = String(args.phone || '').replace(/[\s()-]/g, ''); + if (!/^\+?\d{4,15}$/.test(phone)) return errorResult('Refused: open_chat needs a phone number in international form, e.g. +4560174569. Nothing was done.'); + url = `whatsapp://send?phone=${encodeURIComponent(phone.replace(/^\+/, ''))}`; + } else { + return errorResult(`Refused: unknown intent '${intent}'. Use open_app, play_track or open_chat. Nothing was done.`); + } + const r = await callHelper(['open-url', '--url', url]); + return medSkaerm(textResult(r), r); + } case 'computer_quit': { // ⛔ 23/9: svaret baar intet `took_screen`, saa loggen kunne ikke goere // det op for den her vej. Et program der rejser et «vil du gemme?»-ark @@ -849,6 +875,16 @@ async function haandterKald(request) { targetBundleId = args.app ? await resolveBundleId(args.app) : await frontmostBundleId(); + // Doeren navngiver sit maal via intent'et (ikke via args.app), saa porten + // ser den rigtige app - ikke det der tilfaeldigvis er forrest - og ikke + // kalder den "ukendt maal" og spoerger. Et ugyldigt intent giver null, som + // saa afvises af porten, praecis som det skal. + if (name === 'computer_open') { + targetBundleId = args.intent === 'open_app' ? (args.bundleId ? String(args.bundleId) : null) + : args.intent === 'play_track' ? 'com.spotify.client' + : args.intent === 'open_chat' ? 'net.whatsapp.WhatsApp' + : null; + } // ⛔ FABLE 24/9: et LUKKET program findes ikke blandt de koerende, saa // `computer_launch` blev altid «ukendt maal» og afvist - vaerktoejet // kunne ikke det ene det er til. Hjaelperen svarer nu med det bundle-id diff --git a/mcp-server/tools.js b/mcp-server/tools.js index 7daabfbb..08374984 100644 --- a/mcp-server/tools.js +++ b/mcp-server/tools.js @@ -46,6 +46,22 @@ export const TOOLS = [ required: ['app'] } }, + { + name: 'computer_open', + tier: TIER.WRITE, + description: "Open an app's OWN door in the background - a Spotify track, a WhatsApp chat, or the app itself - without bringing it to the front. This is the way to reach an app whose window is covered, or that will not act from behind: it uses the app's own URL, not its window. It carries navigation ONLY, never a send - to send a message you still act on the open chat and the person confirms it. You give an `intent` and its one parameter, never a URL: the server builds a fixed, validated URL for that intent, and file:, shortcuts:, osascript and anything else are refused.", + inputSchema: { + type: 'object', + required: ['intent'], + properties: { + intent: { type: 'string', enum: ['open_app', 'play_track', 'open_chat'], + description: 'open_app: bring an app up in the background (needs bundleId). play_track: start a Spotify track (needs spotifyId, 22 chars). open_chat: open a WhatsApp chat to a phone number with NO pre-filled text (needs phone).' }, + bundleId: { type: 'string', description: 'For open_app: the app, e.g. com.spotify.client.' }, + spotifyId: { type: 'string', description: 'For play_track: the 22-character Spotify track id.' }, + phone: { type: 'string', description: 'For open_chat: the phone number in international form, e.g. +4560174569.' } + } + } + }, { name: 'computer_quit', tier: TIER.WRITE, diff --git a/test/doer.mjs b/test/doer.mjs new file mode 100644 index 00000000..2ae161b7 --- /dev/null +++ b/test/doer.mjs @@ -0,0 +1,75 @@ +// Døren (computer_open): åbn en app's egen indgang bagfra via et INTENT + én +// typet parameter - aldrig en fri URL fra modellen. Serveren bygger URL'en af +// en fast skabelon og validerer parameteren strengt. +// +// ⛔ HVORFOR DEN FINDES (28/9) +// En dør der tog en fri URL/scheme ville være en generisk bagdør: +// file:, shortcuts://run-shortcut → shell, osascript = Turing-komplet. Prøven +// beviser: (1) der er INGEN url-parameter at injicere i, (2) hver parameter +// valideres så kun cifre/bogstaver passerer, (3) serveren bygger præcis den +// forventede app-URL. Helperen er mocket, så intet åbnes. +import { spawn } from 'node:child_process'; +import { mkdtempSync, writeFileSync, chmodSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +// Mock-helper: ekko den modtagne --url / --app som JSON, aabn intet. +const DIR = mkdtempSync(join(tmpdir(), 'cmcp-doer-')); +const fakeHelper = join(DIR, 'fake-helper'); +writeFileSync(fakeHelper, `#!/bin/bash +cmd="$1"; shift; url=""; app="" +while [ $# -gt 0 ]; do case "$1" in --url) url="$2"; shift 2;; --app) app="$2"; shift 2;; *) shift;; esac; done +if [ "$cmd" = "open-url" ]; then echo "{\\"ok\\":true,\\"echoed_url\\":\\"$url\\",\\"took_screen\\":false}" +elif [ "$cmd" = "launch" ]; then echo "{\\"ok\\":true,\\"result\\":\\"launched in the background\\",\\"echoed_app\\":\\"$app\\",\\"took_screen\\":false}" +else echo "{\\"ok\\":true}"; fi +`); +chmodSync(fakeHelper, 0o755); + +const srv = spawn('node', [join(ROOT, 'mcp-server/index.js')], + { env: { ...process.env, CMCP_HELPER: fakeHelper, CMCP_MODE: 'allow', CMCP_STATUS_IKON: '0', CMCP_STATE_DIR: join(DIR, 'state') }, stdio: ['pipe', 'pipe', 'pipe'] }); +let buf = '', n = 0; const w = new Map(); +srv.stdout.on('data', d => { buf += d; let i; while ((i = buf.indexOf('\n')) >= 0) { const l = buf.slice(0, i); buf = buf.slice(i + 1); try { const m = JSON.parse(l); w.get(m.id)?.(m); } catch {} } }); +const rpc = (m, p) => new Promise(r => { const id = ++n; w.set(id, r); srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method: m, params: p }) + '\n'); }); +const kald = async (args) => { const r = await rpc('tools/call', { name: 'computer_open', arguments: args }); const t = r.result?.content?.[0]?.text ?? ''; let d = null; try { d = JSON.parse(t); } catch {} return { fejl: !!r.result?.isError, tekst: t, data: d }; }; + +try { + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'doer', version: '1' } }); + srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' }) + '\n'); + + const tools = (await rpc('tools/list')).result?.tools || []; + const doer = tools.find(t => t.name === 'computer_open'); + check('1 doeren findes', !!doer); + const props = Object.keys(doer?.inputSchema?.properties || {}); + check('1b der er INGEN url-parameter at injicere i', !props.includes('url'), props.join(',')); + check('1c parametrene er intent + typede felter', props.includes('intent') && props.includes('spotifyId') && props.includes('phone')); + + // Gyldige intents -> praecis den forventede app-URL (mock ekko). + const t1 = await kald({ intent: 'play_track', spotifyId: '4cOdK2wGLETKBW3PvgPWqT' }); + check('2 play_track bygger spotify:track: med id\'et', !t1.fejl && t1.data?.echoed_url === 'spotify:track:4cOdK2wGLETKBW3PvgPWqT', t1.data?.echoed_url || t1.tekst.slice(0, 80)); + const t2 = await kald({ intent: 'open_chat', phone: '+45 60 17 45 69' }); + check('3 open_chat bygger whatsapp://send?phone= (tegnene renset, ingen text)', !t2.fejl && t2.data?.echoed_url === 'whatsapp://send?phone=4560174569', t2.data?.echoed_url || t2.tekst.slice(0, 80)); + + // Ugyldige parametre -> AFVIST, intet aabnet. + const b1 = await kald({ intent: 'play_track', spotifyId: 'file:///etc/passwd' }); + check('4 et forsoeg paa at smugle en sti ind i spotifyId afvises', b1.fejl && !b1.data?.echoed_url, b1.tekst.slice(0, 70)); + const b2 = await kald({ intent: 'open_chat', phone: '4560; do shell script' }); + check('5 et telefonnummer med skal-tekst afvises', b2.fejl, b2.tekst.slice(0, 70)); + const b3 = await kald({ intent: 'run_shortcut', spotifyId: 'x' }); + check('6 et ukendt intent afvises (ingen fri handling)', b3.fejl, b3.tekst.slice(0, 70)); + const b4 = await kald({ intent: 'open_app', bundleId: 'com.x; rm -rf /' }); + check('7 en bundle id med skal-tegn afvises', b4.fejl, b4.tekst.slice(0, 70)); + + // En medsendt fri url AFVISES helt: den er ikke et felt paa vaerktoejet, saa + // der er ingen vej at injicere en scheme ad. (Staerkere end at ignorere den.) + const t3 = await kald({ intent: 'play_track', spotifyId: '4cOdK2wGLETKBW3PvgPWqT', url: 'file:///etc/passwd' }); + check('8 en medsendt fri url AFVISES (intet felt at injicere i)', t3.fejl && !t3.data?.echoed_url, t3.tekst.slice(0, 70)); +} finally { + srv.kill(); +} +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/run-all.sh b/test/run-all.sh index 2b36940a..05cf007c 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -93,6 +93,7 @@ run "paastande" "node test/claims.mjs" # gennem en attrap, saa den koerer HVER gang og viser ingenting. run "fejl-lukket" "node test/failclosed.mjs" run "laas fejler lukket" "node test/laas-fejler-lukket.mjs" +run "doeren" "node test/doer.mjs" run "fejlbeskeder" "node test/errors.mjs" run "flere agenter" "node test/concurrent.mjs" From 35fbb6af4382f313b96a0de7428b811e13db48a0 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 29 Sep 2026 01:38:26 +0800 Subject: [PATCH 008/132] doer (slice 1) doc-sync: computer_open paa alle flader, tal 30->31 Tilfoej computer_open til vaerktoejslisterne (README, llms.txt, tools.html, capability-matrix), bump tool-tallet 30->31 (14 laesende, 17 skrivende) paa alle tekstflader + gemini-extension.json. Udvid ORD-ordlisten i baade sync-tal.py og claims.mjs forbi 'thirty' (crashede/parsede undefined ved 31). Ret to test-hygiejne- fund: doer.mjs saetter fake osascript (vagt 26), og open-url's fejltekst hejser join'et ud i en variabel saa lintens streng-udtraekker ikke eksponerer et dansk variabelnavn (vagt 27). claims.mjs groen. Ingen kode-logik roert. Co-Authored-By: Claude Opus 5.5 --- README.md | 6 +++--- docs/404.html | 2 +- docs/blog/driving-macos-from-an-ai-agent.html | 2 +- docs/docs/capability-matrix/index.html | 8 ++++---- docs/docs/install-claude-code/index.html | 6 +++--- docs/docs/install-claude-desktop/index.html | 6 +++--- docs/docs/install-codex/index.html | 6 +++--- docs/docs/install-copilot/index.html | 6 +++--- docs/docs/install-cursor/index.html | 6 +++--- docs/docs/install-vscode/index.html | 6 +++--- docs/index.html | 10 +++++----- docs/learn/computer-use-mcp/index.html | 2 +- docs/learn/owasp-mcp-top-10/index.html | 2 +- docs/llms-install.md | 4 ++-- docs/llms.txt | 6 +++--- docs/tools.html | 10 +++++++--- docs/use-cases/unattended-runs/index.html | 2 +- .../without-taking-over-your-screen/index.html | 12 ++++++------ gemini-extension.json | 2 +- helper/Sources/cmcp-helper/main.swift | 3 ++- mcp-server/README.md | 6 +++--- scripts/sync-tal.py | 4 +++- test/claims.mjs | 4 +++- test/doer.mjs | 4 +++- 24 files changed, 68 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index ebe09e0e..c87de2e5 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ it refuses. ## Tools -**30 tools: fourteen that look, sixteen that touch.** Twenty are offered by +**31 tools: fourteen that look, seventeen that touch.** Twenty are offered by default, and the agent uses them without asking - the same way a browser tool drives a browser. Two gates survive that, and they are the two that matter: @@ -208,12 +208,12 @@ Both surviving gates are mutation-proved: break them in the source and the refusal turns into a free pass, which is how we know the test can fail. -> **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 30 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. +> **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 31 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. **Look:** `computer_pending` · `computer_screenshot` · `computer_record` · `computer_inspect` · `computer_find` · `computer_wait_for` · `computer_focused` · `computer_apps` · `computer_windows` · `computer_permissions` · `computer_displays` · `computer_menus` · `computer_audit` · `computer_learning` -**Touch:** `computer_launch` · `computer_quit` · `computer_paste` · `computer_window` · `computer_space` · `computer_menu` · `computer_press` · `computer_set_value` · `computer_ask_user` · +**Touch:** `computer_launch` · `computer_open` · `computer_quit` · `computer_paste` · `computer_window` · `computer_space` · `computer_menu` · `computer_press` · `computer_set_value` · `computer_ask_user` · `computer_click` · `computer_drag` · `computer_type` · `computer_key` · `computer_scroll` · `computer_move` · `computer_activate` diff --git a/docs/404.html b/docs/404.html index 9f015b8b..b66f7e90 100644 --- a/docs/404.html +++ b/docs/404.html @@ -87,7 +87,7 @@

The pages that do exist

Install for Claude Code Install for Codex Install for Cursor -All 30 tools +All 31 tools Capability matrix Threat model MCP security diff --git a/docs/blog/driving-macos-from-an-ai-agent.html b/docs/blog/driving-macos-from-an-ai-agent.html index e4f5c76c..67bdb168 100644 --- a/docs/blog/driving-macos-from-an-ai-agent.html +++ b/docs/blog/driving-macos-from-an-ai-agent.html @@ -156,7 +156,7 @@

What we would tell someone starting today

-

Computer MCP is the macOS computer-use MCP server these findings came out of. Thirty tools, no API key, MIT, and a security model that is specific about what it does not cover. The recipes folder collects app-specific notes like the Electron numbers above, and it takes contributions.

+

Computer MCP is the macOS computer-use MCP server these findings came out of. Thirty-one tools, no API key, MIT, and a security model that is specific about what it does not cover. The recipes folder collects app-specific notes like the Electron numbers above, and it takes contributions.

diff --git a/docs/docs/capability-matrix/index.html b/docs/docs/capability-matrix/index.html index f63f79f2..0ecc652d 100644 --- a/docs/docs/capability-matrix/index.html +++ b/docs/docs/capability-matrix/index.html @@ -8,7 +8,7 @@ - + @@ -119,7 +119,7 @@

Walls we clear partly, and say so

The Dock and the status iconsmeasuredWi-Fi, the clock, the battery, and every app in the Dock were invisible until today, and the reason was not that they are special: they simply live outside any window. Measured: the Dock has zero windows and 32 dock items hanging off the application itself; Control Center has zero windows and nine menu bar items. The search walked down through windows only, so everything outside one was unreachable. It now falls back to the application element when an app has no windows - computer_find returns them like anything else, with a center you can click and a pressable flag. Nothing changes for apps that do have windows. Whether an update breaks your permissionsmeasuredIt does not. The grant belongs to the host - the app that launches the server, which is your terminal, your editor or Claude Desktop - and not to our binary. Measured directly: the same helper run from a path macOS had never seen still reports Accessibility, and so does a copy with a byte appended, which gives it a different signature entirely. So upgrading the package does not send you back to System Settings. The flip side is worth knowing too: the permission you granted covers anything that host launches, not this tool alone. Knowing that something is waiting for youmeasuredIf the server may never take the screen, it cannot knock either. A write that would need a dialog is refused, and the explanation goes back to the model - which only reaches you if you read that particular conversation. computer_pending makes it visible instead: what was asked for, when, and why it stopped. It is a list, not a button - nothing there can be approved from there, because a consent granted without a human is the one thing the gate exists to prevent. To allow the work you change the mode, and the queue simply says what is waiting. -Never taking over the screen at allmeasuredThis is the default. The server runs in background mode unless you set CMCP_BACKGROUND=0, and a typo does not turn it off - only 0, false, no or off count as a no.

What that means for the tools. Until 21 September background mode hid all thirteen of those that could take the screen, which made it the product minus half its hands. That was because "takes the screen" was a property of the tool's name. It is not - it is a property of the delivery. An event sent to the global input stream lands in whatever window you are using; the same event delivered into one app's own queue does not. So four of them - computer_type, computer_key, computer_scroll and computer_click - now take an app, and with it they are offered in background mode. Without one the call is refused with an explanation of what to pass instead. Measured: 22 of the 30 are offered in background, eight of them writing - up from 15 and three.

Measured on a machine in use, through the shipped product: text typed into an app that was not in front arrived in that app, the pointer stayed where the person had left it, and the front window did not change. Typing goes into the field that app has focus in and is read back; a field that does not accept that (and every password field) gets keystrokes instead, which an app in the background can drop, and the answer then says the text was not confirmed. That measurement covers typing and key presses. Clicks and scrolls take the same route and have not been measured - a mouse event carries no window number, and whether an app accepts one it never saw the pointer reach is a question we have not answered. The answer still reports on the screen honestly; it does not claim the click landed. Every key press, click, scroll and typed string now carries took_screen in its own answer, derived from what the server did rather than from what happened around it - so it cannot mistake the person moving their own mouse for the server moving it.

Still hidden in background mode, and some always will be: computer_move is the pointer, computer_activate and computer_space exist to move you, and computer_ask_user is a dialog. computer_launch joins the quiet side with background: true - the app starts behind what you are doing. quit, window, drag and paste have not been rebuilt yet.

One thing it does to other apps, and you should know it. To find a password field in Slack, Notion or Discord at all, Chromium's accessibility tree has to be on - so taking a screenshot switches it on in every app on screen, not only the one you asked about. Without that, the blackout is blind in exactly the apps where people type passwords. The cost is carried by those apps: they build and keep a tree they would not otherwise have. CMCP_INGEN_ELECTRON=1 turns it off, and the blackout is then blind there.

The honest limit that does not change: this is a promise about what we do. Press a button and the app may open a window of its own; that is its choice, not ours. +Never taking over the screen at allmeasuredThis is the default. The server runs in background mode unless you set CMCP_BACKGROUND=0, and a typo does not turn it off - only 0, false, no or off count as a no.

What that means for the tools. Until 21 September background mode hid all thirteen of those that could take the screen, which made it the product minus half its hands. That was because "takes the screen" was a property of the tool's name. It is not - it is a property of the delivery. An event sent to the global input stream lands in whatever window you are using; the same event delivered into one app's own queue does not. So four of them - computer_type, computer_key, computer_scroll and computer_click - now take an app, and with it they are offered in background mode. Without one the call is refused with an explanation of what to pass instead. Measured: 23 of the 31 are offered in background, nine of them writing - up from 15 and three.

Measured on a machine in use, through the shipped product: text typed into an app that was not in front arrived in that app, the pointer stayed where the person had left it, and the front window did not change. Typing goes into the field that app has focus in and is read back; a field that does not accept that (and every password field) gets keystrokes instead, which an app in the background can drop, and the answer then says the text was not confirmed. That measurement covers typing and key presses. Clicks and scrolls take the same route and have not been measured - a mouse event carries no window number, and whether an app accepts one it never saw the pointer reach is a question we have not answered. The answer still reports on the screen honestly; it does not claim the click landed. Every key press, click, scroll and typed string now carries took_screen in its own answer, derived from what the server did rather than from what happened around it - so it cannot mistake the person moving their own mouse for the server moving it.

Still hidden in background mode, and some always will be: computer_move is the pointer, computer_activate and computer_space exist to move you, and computer_ask_user is a dialog. computer_launch joins the quiet side with background: true - the app starts behind what you are doing. quit, window, drag and paste have not been rebuilt yet.

One thing it does to other apps, and you should know it. To find a password field in Slack, Notion or Discord at all, Chromium's accessibility tree has to be on - so taking a screenshot switches it on in every app on screen, not only the one you asked about. Without that, the blackout is blind in exactly the apps where people type passwords. The cost is carried by those apps: they build and keep a tree they would not otherwise have. CMCP_INGEN_ELECTRON=1 turns it off, and the blackout is then blind there.

The honest limit that does not change: this is a promise about what we do. Press a button and the app may open a window of its own; that is its choice, not ours. Password managers, in the tree as well as the imagemeasuredScreenshots black out Keychain Access, Apple Passwords, 1Password, Bitwarden, LastPass and Dashlane entirely. Until today the accessibility tree did not: computer_inspect and computer_find would hand over the contents of the very window the image hides - as a read, so with no consent, in read-only mode, and in background mode. Anything not marked as a secure field came with it: a revealed password sitting in a static field, a one-time code, a secure note, every username. Both now stop at the app: find returns nothing, inspect returns one node saying denied and why - silence with a reason beats silence. Measured on a running app added to the list: 3 matches and 33 nodes became 0 and 1, with zero values. Acting quietly inside an appmeasuredThe quiet route - computer_press and computer_set_value, which work on a window behind another one without moving your pointer - only exists where the app publishes an accessibility tree. Measured on five running apps: Chrome exposes 321 elements across 4 windows, 148 of them things you can actually press or type into. An Electron app measured before its tree was switched on exposed its 2 windows and 16 elements inside them, none usable; with the tree on, the same two windows gave 728 buttons. Finder's desktop window is 103 icons and nothing pressable. Where the tree is empty the only route left is a screenshot and a click by coordinate - which does move the real cursor. So "works on a window behind another one" is true of the app, not of every app. Reaching a full-screen appmeasuredcomputer_space switches desktop the way Control+Arrow does, because macOS gives every full-screen window its own desktop - a window the agent cannot find is often simply on another one. It is the one tool here that deliberately does move what you are looking at, so it asks every time, in every mode, like quitting an app. Two honest limits, both measured: if the system shortcut for switching desktops is off on this machine it says so and sends nothing rather than pressing a dead key; and it reports whether the desktop actually changed by comparing which windows are on screen before and after, so it never claims a switch it cannot prove. Two earlier ways of checking that were wrong - counting accessibility windows drifted 10 to 8 with nothing changing, and the system notification never reaches a short-lived command-line process. @@ -147,10 +147,10 @@

Not yet, and honestly named

Windows or Linuxwill notmacOS only, and none planned. The accessibility model is the product. -

The thirty tools

+

The thirty-one tools

- +
Look (14)computer_permissions · computer_record · computer_apps · computer_windows · computer_displays · computer_menus · computer_screenshot · computer_inspect · computer_pending · computer_audit · computer_find · computer_wait_for · computer_focused · computer_learning
Touch (16)computer_launch · computer_quit · computer_drag · computer_space · computer_paste · computer_window · computer_menu · computer_set_value · computer_press · computer_ask_user · computer_click · computer_move · computer_scroll · computer_type · computer_key · computer_activate
Touch (17)computer_launch · computer_open · computer_quit · computer_drag · computer_space · computer_paste · computer_window · computer_menu · computer_set_value · computer_press · computer_ask_user · computer_click · computer_move · computer_scroll · computer_type · computer_key · computer_activate

In CMCP_MODE=readonly only the fourteen reading tools are listed at all. A model that can see a tool will eventually try it, and a refusal per call is noise.

diff --git a/docs/docs/install-claude-code/index.html b/docs/docs/install-claude-code/index.html index cc0407b9..a4b4d7b4 100644 --- a/docs/docs/install-claude-code/index.html +++ b/docs/docs/install-claude-code/index.html @@ -91,7 +91,7 @@

Install Computer MCP for Claude Code

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for Claude Code

Start in read-only. Set CMCP_MODE=readonly for the first run and -the sixteen write tools are not even listed to the model. It can look at your screen and it +the seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything, and you can move to ask when you have. Step 1b below shows where the setting goes.

@@ -202,7 +202,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach Threat model MCP security checklist diff --git a/docs/docs/install-claude-desktop/index.html b/docs/docs/install-claude-desktop/index.html index e83eeb95..be672a5b 100644 --- a/docs/docs/install-claude-desktop/index.html +++ b/docs/docs/install-claude-desktop/index.html @@ -91,7 +91,7 @@

Install Computer MCP for Claude Desktop

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for Claude Desktop

Start in read-only. Set CMCP_MODE=readonly for the first run and the -sixteen write tools are not even listed to the model. It can look at your screen and it cannot +seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything.

@@ -229,7 +229,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach When not to use it Uninstall diff --git a/docs/docs/install-codex/index.html b/docs/docs/install-codex/index.html index 11974e6d..a22e8f49 100644 --- a/docs/docs/install-codex/index.html +++ b/docs/docs/install-codex/index.html @@ -91,7 +91,7 @@

Install Computer MCP for OpenAI Codex

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for OpenAI Codex

Start in read-only. Set CMCP_MODE=readonly for the first run and -the sixteen write tools are not even listed to the model. It can look at your screen and it +the seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything, and you can move to ask when you have. Step 1b below shows where the setting goes.

@@ -202,7 +202,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach Threat model MCP security checklist diff --git a/docs/docs/install-copilot/index.html b/docs/docs/install-copilot/index.html index 84de4032..3deb78e4 100644 --- a/docs/docs/install-copilot/index.html +++ b/docs/docs/install-copilot/index.html @@ -91,7 +91,7 @@

Install Computer MCP for GitHub Copilot

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for GitHub Copilot

Start in read-only. Set CMCP_MODE=readonly for the first run and the -sixteen write tools are not even listed to the model. It can look at your screen and it cannot +seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything.

@@ -228,7 +228,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach When not to use it Uninstall diff --git a/docs/docs/install-cursor/index.html b/docs/docs/install-cursor/index.html index 96986f86..7f6a7dda 100644 --- a/docs/docs/install-cursor/index.html +++ b/docs/docs/install-cursor/index.html @@ -91,7 +91,7 @@

Install Computer MCP for Cursor

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for Cursor

Start in read-only. Set CMCP_MODE=readonly for the first run and -the sixteen write tools are not even listed to the model. It can look at your screen and it +the seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything, and you can move to ask when you have. Step 1b below shows where the setting goes.

@@ -215,7 +215,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach Threat model MCP security checklist diff --git a/docs/docs/install-vscode/index.html b/docs/docs/install-vscode/index.html index 2a6ad8b7..ffd8991f 100644 --- a/docs/docs/install-vscode/index.html +++ b/docs/docs/install-vscode/index.html @@ -91,7 +91,7 @@

Install Computer MCP for VS Code

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has 30: menu bar +0.1.0, which has 12 tools. The code in the repository has 31: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -108,7 +108,7 @@

Install Computer MCP for VS Code

Start in read-only. Set CMCP_MODE=readonly for the first run and the -sixteen write tools are not even listed to the model. It can look at your screen and it cannot +seventeen write tools are not even listed to the model. It can look at your screen and it cannot touch anything. You see the whole tool list before you grant anything.

@@ -218,7 +218,7 @@

FAQ

Is there a Windows or Linux build?

No, and there is no plan for one. The three guarantees are built on macOS APIs: the Accessibility API for what an element is, and ScreenCaptureKit for the screenshot. A port would be a different product with different guarantees, not the same one recompiled.

Related

-
All 30 tools +
All 31 tools What it can and cannot reach When not to use it Uninstall diff --git a/docs/index.html b/docs/index.html index d4b3c8fe..a16ac7b3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ Computer MCP - computer use you can actually leave running - + @@ -183,8 +183,8 @@

What still asks, and

Install

-

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 30 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

-

Add it to your MCP client, grant two macOS permissions, done. It starts ready to work: twenty-two of the thirty, no asking, except your password manager, anything that deletes or clears, and starting a screen recording. It runs in the background by default, so nothing takes your screen; CMCP_BACKGROUND=0 adds the eight that do.

+

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 31 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

+

Add it to your MCP client, grant two macOS permissions, done. It starts ready to work: twenty-three of the thirty-one, no asking, except your password manager, anything that deletes or clears, and starting a screen recording. It runs in the background by default, so nothing takes your screen; CMCP_BACKGROUND=0 adds the eight that do.

@@ -270,8 +270,8 @@

No API key, no se
-

thirty tools

-

fourteen that look, sixteen that touch. Grouped by what you would +

thirty-one tools

+

fourteen that look, seventeen that touch. Grouped by what you would actually want, with the names underneath in case you are wiring this up yourself.

Claude Codeclaude mcp add computer -- npx -y @agent360/computer-mcp
Cursor / VS Code / CodexIn mcp.json: {"command":"npx","args":["-y","@agent360/computer-mcp"]}
diff --git a/docs/learn/computer-use-mcp/index.html b/docs/learn/computer-use-mcp/index.html index f3520aae..b9f8317e 100644 --- a/docs/learn/computer-use-mcp/index.html +++ b/docs/learn/computer-use-mcp/index.html @@ -262,7 +262,7 @@

Related

MCP security: what a server can reachLeaving an agent running overnightWhen not to use it -All 30 tools +All 31 tools

Computer MCP is built by Agent360, who also make diff --git a/docs/learn/owasp-mcp-top-10/index.html b/docs/learn/owasp-mcp-top-10/index.html index 0b10be36..09aadd7a 100644 --- a/docs/learn/owasp-mcp-top-10/index.html +++ b/docs/learn/owasp-mcp-top-10/index.html @@ -127,7 +127,7 @@

The ten, and what we do about each

+talked into trying. Measured: 31 tools in full mode, 11 in read-only.
So it can...What that means
addressed Tools carry a tier, and CMCP_MODE=readonly does not merely refuse the write tools - it does not list them. A tool the model cannot see is a tool it cannot be -talked into trying. Measured: 30 tools in full mode, 11 in read-only.
MCP03Tool Poisoning not our layer This is about a malicious server diff --git a/docs/llms-install.md b/docs/llms-install.md index d66fc486..4560da19 100644 --- a/docs/llms-install.md +++ b/docs/llms-install.md @@ -9,11 +9,11 @@ finished until `computer_permissions` confirms it. Computer MCP drives macOS itself: it reads the accessibility tree, takes screenshots, clicks, types, presses buttons, chooses menu items and moves -windows. The source has **30 tools, 14 of them read-only**, no API key, and +windows. The source has **31 tools, 14 of them read-only**, no API key, and no network calls of its own. -> **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 30 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. +> **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 31 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. The design premise is that it is safe to leave running: password fields are blacked out in memory before a screenshot is written to disk, writes go through a consent gate, and every action lands in a log the server only appends to - every line carries a fingerprint of itself and the one before it, so a removed or edited line breaks the chain and says where that never stores typed text in clear. diff --git a/docs/llms.txt b/docs/llms.txt index bfbdaf4a..30931017 100644 --- a/docs/llms.txt +++ b/docs/llms.txt @@ -6,7 +6,7 @@ > log that only grows. No account, no API key, no model inside it. MIT. # FORBEHOLD -VERSION: npx serves 0.1.0, which has 12 tools. The 30 tools described below +VERSION: npx serves 0.1.0, which has 12 tools. The 31 tools described below the source: they are built and tested but not published yet. Do not tell a user that a tool is available after an npx install unless it is one of the twelve. # /FORBEHOLDInstall: `npx @agent360/computer-mcp` (ships a signed universal binary; no Swift needed) @@ -52,7 +52,7 @@ for, because that machine also holds passwords, keys and production terminals. password managers still ask every time, terminals and editors once per session, and that is not configurable -## The 30 tools, 14 of them read-only +## The 31 tools, 14 of them read-only Look: computer_screenshot, computer_record, computer_inspect, computer_find, computer_wait_for, computer_focused, computer_apps, computer_windows, computer_displays, @@ -61,7 +61,7 @@ computer_permissions, computer_pending computer_audit computer_learning -Touch: computer_launch, computer_quit, computer_paste, computer_window, computer_space, computer_menu, computer_press, computer_set_value, computer_ask_user, computer_click, +Touch: computer_launch, computer_open, computer_quit, computer_paste, computer_window, computer_space, computer_menu, computer_press, computer_set_value, computer_ask_user, computer_click, computer_type, computer_key, computer_scroll, computer_move, computer_drag, computer_activate computer_ask_user returns only true or false - never text. It is how a human diff --git a/docs/tools.html b/docs/tools.html index c4c27786..db4556b7 100644 --- a/docs/tools.html +++ b/docs/tools.html @@ -4,7 +4,7 @@ Tool reference - Computer MCP - + @@ -71,10 +71,10 @@

Tool reference

-

thirty tools. fourteen look, sixteen touch. The useful part of this page is not the parameter lists - it is knowing which tool to reach for when the obvious one is the wrong one.

+

thirty-one tools. fourteen look, seventeen touch. The useful part of this page is not the parameter lists - it is knowing which tool to reach for when the obvious one is the wrong one.

-

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 30 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

+

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 31 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

The one habit that matters. Find things by name, not by pixel. computer_inspect and computer_find return the frame of every element, so the agent can act on "the Log in button" rather than on a coordinate that stops being true the moment a window moves. Reach for computer_click only when there is no accessibility element to aim at: a canvas, a map, an image.

@@ -112,6 +112,10 @@

computer_launchwrite

Open an application, by bundle ID or by its plain name. computer_activate can only bring forward something already running; this starts what is closed. Already running, it just comes forward, and the answer says which of the two happened.

Launching cannot lose anything, so it is not on the always-ask list the way quitting is - but it is still a write, and it goes through the same gate as every other write: refused in read-only mode, and in ask mode the first one asks for the session. Quitting is separate because it can lose work, and it asks every single time.

+

computer_openwrite

+

Open an app's own door in the background - a Spotify track, a WhatsApp chat, or the app itself - via the app's own URL, never a send. You give an intent and its one parameter, not a URL: the server builds a fixed, validated URL for that intent, and anything else is refused.

+

It carries navigation only. To send a message you still act on the chat once it is open, and the person confirms it - opening a chat is not sending into it.

+

computer_quitwrite

Ask an application to quit, the same way Cmd+Q does. It never kills a process: the app still gets to ask you about unsaved work, and an agent should trigger that question rather than route around it.

Quitting can lose work, so this asks every time, in every mode - like closing a window, and like a menu item that looks destructive.

diff --git a/docs/use-cases/unattended-runs/index.html b/docs/use-cases/unattended-runs/index.html index 1b01e661..871cfe2d 100644 --- a/docs/use-cases/unattended-runs/index.html +++ b/docs/use-cases/unattended-runs/index.html @@ -166,7 +166,7 @@

FAQ

What should I do before starting a long run?

Look at your own screen. Close terminals with credentials in the scrollback and quit the password manager. The redaction covers what macOS marks as secure; it cannot cover a secret sitting in a plain text window.

Related

Install for Claude Code -All 30 tools +All 31 tools What it can and cannot reach When not to use it Threat model
diff --git a/docs/use-cases/without-taking-over-your-screen/index.html b/docs/use-cases/without-taking-over-your-screen/index.html index 69ee5a57..3cfc6ae1 100644 --- a/docs/use-cases/without-taking-over-your-screen/index.html +++ b/docs/use-cases/without-taking-over-your-screen/index.html @@ -8,15 +8,15 @@ - + - + - + +

Kontaktark · hver use case, før og efter (B3)

+

Trukket automatisk fra filmene i dette CI-job. Intet er optaget på Gustavs Mac.

+{''.join(rows)}
ScenarieBaggrundForgrund
+

Parallelle agenter

+
{par_rows}
+""" + (ud_dir / "index.html").write_text(html, encoding="utf-8") + print(f"Kontaktark skrevet: {ud_dir / 'index.html'} ({len(use_cases)} scenarier, {len(parallelle)} parallel-film)") + + +if __name__ == "__main__": + main() From f22496a52e66c884da4910b5bdbc200a4a1e1243 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 14:30:18 +0800 Subject: [PATCH 059/132] =?UTF-8?q?sikkerhed:=20et=20blindt=20koordinat-kl?= =?UTF-8?q?ik=20fejlede=20=C3=85BENT=20i=20stedet=20for=20lukket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fundet af Opus i et konsulentpanel om canvas-blinde apps (2/10): knapErFarlig() behandlede "intet fundet på punktet", "fundet uden navn/beskrivelse" og "opslaget fejlede" som IKKE farligt for computer_click - selvom et koordinat-klik rammer skærmen uanset om opslaget her lykkes. Et "Delete" i en canvas-tegnet dialog, et fjernskrivebord, eller ethvert punkt serveren ikke kan identificere, kunne rammes uden at nogen blev spurgt - stik imod README's løfte om at alt der sletter eller rydder spørger hver gang. Den oprindelige begrundelse ("et tryk der ikke kan slås op, finder heller ikke noget at trykke på") holder for computer_press, som ikke kan udføres uden et fundet element - men ikke for et klik. De tre tilfælde fejler nu LUKKET (spørg) for klik, mens press er uændret (fejler stadig åbent, med rette). test/knap-ord.mjs udvidet med tre nye tjek (intet fundet, intet navn, opslaget fejler) + ny kalibrering. Mutant Q26 i .github/mutanter-porte.json. Begge bekræftet manuelt: reverteres fixet, går præcis de tre nye tjek røde. --- .github/mutanter-porte.json | 12 ++++++++++++ mcp-server/index.js | 27 ++++++++++++++++++++------- test/knap-ord.mjs | 19 ++++++++++++++++++- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 6ee5aa9d..9f61c512 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -850,5 +850,17 @@ " alwaysAsk: menuFarlig" ] ] + }, + { + "navn": "Q26-klik-fejler-aabent", + "fil": "mcp-server/index.js", + "proeve": "test/knap-ord.mjs", + "forventet": "6 intet fundet", + "par": [ + [ + " if (!d?.found) return true;", + " if (!d?.found) return false;" + ] + ] } ] diff --git a/mcp-server/index.js b/mcp-server/index.js index 0241ee59..46a44b18 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -470,19 +470,32 @@ async function menuGenvejErFarlig(app, path) { /// «Erase», trykket med computer_press eller ramt af et klik, spurgte aldrig. /// Samme ord som menuen. Kendes elementets navn ikke, kan det ikke doemmes herfra: /// et tryk der ikke kan slaas op, finder heller ikke noget at trykke paa. +/// ⛔ 2/10 (Opus-panelet, canvas-spørgsmålet): den sætning gælder KUN press - et +/// tryk der ikke kan slås op, rammer intet, så at fejle åbent er harmløst der. +/// Et KOORDINAT-KLIK rammer skærmen uanset om opslaget her lykkes. Før stod +/// "intet fundet"/"intet navn"/en fejl alle som `false` (ikke farligt) - netop +/// de tre tilstande hvor serveren IKKE ved hvad der klikkes på (en canvas-tegnet +/// dialog, et fjernskrivebord, et navnløst element). README's løfte holdt ikke +/// på den vej: et "Delete" kunne rammes blindt uden at nogen blev spurgt. Et +/// punkt vi ikke kan identificere, er nu farligt - spørg, fail CLOSED. async function knapErFarlig(name, args) { - try { - if (name === 'computer_press') { + if (name === 'computer_press') { + try { const { a, soeg } = trykArgv(args); const d = await callHelper([...a, '--dry'], { stdin: JSON.stringify(soeg), timeout: 15000 }); const el = d?.would_press; return !!el && [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n)); - } - if (name === 'computer_click' && Number.isFinite(args.x) && Number.isFinite(args.y)) { + } catch { return false; } + } + if (name === 'computer_click' && Number.isFinite(args.x) && Number.isFinite(args.y)) { + try { const d = await callHelper(['at', '--x', String(args.x), '--y', String(args.y)], { timeout: 8000 }); - return !!d?.found && [d.title, d.description].filter(Boolean).some(n => menuSerFarlig(n)); - } - } catch {} + if (!d?.found) return true; + const navne = [d.title, d.description].filter(Boolean); + if (!navne.length) return true; + return navne.some(n => menuSerFarlig(n)); + } catch { return true; } + } return false; } diff --git a/test/knap-ord.mjs b/test/knap-ord.mjs index bcb858b3..72535329 100644 --- a/test/knap-ord.mjs +++ b/test/knap-ord.mjs @@ -64,7 +64,24 @@ ved('Delete'); f = klikket(); await kald('computer_click', { app: 'com.apple.TextEdit', x: 100, y: 200 }); check('4 et klik der rammer «Delete», sker IKKE uden et ja', klikket() === f); -check('5 kalibrering: porten spurgte et menneske om 1, 2 og 4', spoerger.gangeSpurgt() === 3, `spurgt ${spoerger.gangeSpurgt()} gange`); +// ⛔ 2/10 (Opus-panelet): et klik rammer UANSET om opslaget her kan sige hvad +// der er på punktet - i modsætning til press, som slet ikke kan udføres uden +// et fundet element. Før fejlede disse tre tilfælde ÅBENT (ikke farligt). +writeFileSync(AT, JSON.stringify({ ok: true, found: false })); f = klikket(); +await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); +check('6 intet fundet på punktet: klikket sker IKKE uden et ja (fail closed)', klikket() === f); + +writeFileSync(AT, JSON.stringify({ ok: true, found: true, bundleId: 'com.apple.TextEdit', role: 'AXUnknown' })); f = klikket(); +await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); +check('7 fundet, men uden navn eller beskrivelse: klikket sker IKKE uden et ja', klikket() === f); + +const stubKilde = readFileSync(STUB, 'utf8'); +writeFileSync(STUB, stubKilde.replace(/^ at\) cat .*$/m, ' at) exit 1 ;;')); f = klikket(); +await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); +check('8 opslaget selv fejler: klikket sker IKKE uden et ja', klikket() === f); +writeFileSync(STUB, stubKilde); + +check('9 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); srv.kill(); console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From a3483c54e97deedd1fffcb8b62ab8d3f8d6df471 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 14:39:42 +0800 Subject: [PATCH 060/132] =?UTF-8?q?D3:=20f=C3=B8lg-panelets=20"Show=20me?= =?UTF-8?q?=20where"=20-=20peger=20p=C3=A5=20agentens=20m=C3=A5l=20uden=20?= =?UTF-8?q?selv=20at=20tage=20fokus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Følg-panelet (klik på en session i menuen) viste kun løbende tekst om hvad agenten gør. D3 bad om mere: "panelet peger på det program/vindue agenten arbejder i, uden at tage forgrunden af sig selv - menneskets klik er det eneste der flytter fokus". status.js: statusHandling() tager nu en valgfri tredje parameter - den raa app-streng (bundle-id ELLER synligt navn) serveren allerede har i hånden fra `args.app`. Slås IKKE op her (resolveApp ville lægge et ekstra helper-opslag på HVER handling bare for denne knap) - ikonet forsøger selv begge former, når mennesket klikker. main.swift: Post fik et `target`-felt. LivePanel fik en "Show me where"-knap, samme princip som den eksisterende "Take me there" på et samtykke (hentFrem): MENNESKETS klik aktiverer appen, agenten rører aldrig forgrunden selv. Knappen læser `senesteMaal()` - det igangværende mål, eller ellers det sidst FÆRDIGE (uden faldbagget ville den næsten aldrig være aktiv, fordi `now` kun er sat de få millisekunder en handling rent faktisk kører). --dump fik et nyt `nowTarget`-felt, så test/status-ikon.mjs kan bevise at målet når helt frem uden en levende GUI (D3's prøve-halvdel). Knappens EGEN aktivering (klik → appen kommer frem) kræver stadig film på GitHubs Mac, som D1-D4 alle gør. Verificeret lokalt: swift build ren, scripts/build-release.sh kørt (vendor- binær opdateret, gitignored), test/status-ikon.mjs + test/ikon-menu.mjs begge grønne mod den friske binær. --- helper/Sources/cmcp-status/main.swift | 54 +++++++++++++++++++++++++-- mcp-server/index.js | 4 +- mcp-server/status.js | 10 ++++- test/status-ikon.mjs | 9 +++++ 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index d6907871..7b3be878 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -21,7 +21,10 @@ import UserNotifications // MARK: - Model -struct Post: Codable { let ts: String; let text: String; let outcome: String } +// D3 (2/10): `target` er den raa app-streng (bundle-id ELLER synligt navn) serveren +// allerede havde i hånden - se status.js' statusHandling for hvorfor den ikke +// slås op dér. Mangler nøglen i ældre/andre poster, afkodes den som nil (Codable). +struct Post: Codable { let ts: String; let text: String; let outcome: String; let target: String? } struct Session: Codable { let session: String let pid: Int32 @@ -90,6 +93,15 @@ func overskrift(_ n: Int) -> String { } /// Live-vinduets tekst for én agent: nyeste oeverst. +/// D3 (2/10): det seneste KENDTE maal - den igangvaerende handling hvis der er +/// én, ellers den sidst FAERDIGE. `now` er kun sat de faa millisekunder en +/// handling rent faktisk koerer; uden faldbagget til `recent` ville "Show me +/// where" naesten aldrig vaere aktiv, fordi de fleste handlinger er for hurtige +/// til at nogen naar at se dem som "now". +func senesteMaal(_ s: Session) -> String? { + s.now?.target ?? s.recent.last?.target +} + func liveTekst(_ s: Session) -> String { var linjer = ["\(navn(s)) (pid \(s.pid), started \(siden(s.started)))", ""] if let n = s.now { linjer.append("NOW ▶︎ \(n.text)"); linjer.append("") } @@ -481,7 +493,13 @@ if CommandLine.arguments.contains("--dump") { "title": overskrift(s.count), "items": s.map(menuLinje), "live": s.map(liveTekst), - "sessions": s.map { $0.session } + "sessions": s.map { $0.session }, + // D3: maalet for den igangvaerende handling, saa en proeve kan maale at + // det naar helt frem til --dump uden en levende GUI. nil -> NSNull (JSON null). + "nowTarget": s.map { sess -> Any in + if let t = senesteMaal(sess) { return t } + return NSNull() + } ] let data = try! JSONSerialization.data(withJSONObject: ud, options: [.prettyPrinted, .sortedKeys]) FileHandle.standardOutput.write(data) @@ -506,8 +524,10 @@ startSocket() final class LivePanel: NSObject, NSWindowDelegate { let panel: NSPanel let tekst: NSTextView + let visKnap = NSButton(title: "Show me where", target: nil, action: nil) var session: String var lukket: () -> Void = {} + var maal: String? = nil // raa app-streng fra den igangvaerende handling (D3) init(session: String) { self.session = session @@ -521,7 +541,11 @@ final class LivePanel: NSObject, NSWindowDelegate { panel.hidesOnDeactivate = false panel.becomesKeyOnlyIfNeeded = true panel.isReleasedWhenClosed = false - let scroll = NSScrollView(frame: panel.contentView!.bounds) + // D3 (2/10): en knaprad nederst, resten scroller. MENNESKETS klik henter + // programmet frem - samme princip som "Take me there" paa et samtykke + // (hentFrem): agenten selv roerer aldrig forgrunden. + let hoejde = panel.contentView!.bounds.height + let scroll = NSScrollView(frame: NSRect(x: 0, y: 32, width: panel.contentView!.bounds.width, height: hoejde - 32)) scroll.autoresizingMask = [.width, .height] scroll.hasVerticalScroller = true tekst = NSTextView(frame: scroll.bounds) @@ -531,7 +555,15 @@ final class LivePanel: NSObject, NSWindowDelegate { tekst.autoresizingMask = [.width] scroll.documentView = tekst panel.contentView?.addSubview(scroll) + visKnap.frame = NSRect(x: 12, y: 6, width: 160, height: 22) + visKnap.bezelStyle = .rounded + visKnap.controlSize = .small + visKnap.autoresizingMask = [.maxXMargin] + visKnap.isEnabled = false + panel.contentView?.addSubview(visKnap) super.init() + visKnap.target = self + visKnap.action = #selector(visMigHvor) panel.delegate = self } @@ -548,11 +580,27 @@ final class LivePanel: NSObject, NSWindowDelegate { func opdater() { guard let s = laesSessioner().first(where: { $0.session == session }) else { panel.title = "Computer MCP — agent \(session) has stopped" + maal = nil; visKnap.isEnabled = false return } panel.title = "Computer MCP — \(navn(s))" let ny = liveTekst(s) if tekst.string != ny { tekst.string = ny } + maal = senesteMaal(s) + visKnap.isEnabled = maal != nil + } + + /// MENNESKETS klik - aldrig agentens. Proever bundle-id foerst (det + /// aegte format), falder tilbage til et synligt navn (det modellen kan + /// have skrevet i stedet). Finder den intet, sker der ingenting - ingen + /// fejlboks, ingen gaetten paa et andet program. + @objc func visMigHvor() { + guard let m = maal, !m.isEmpty else { return } + if let app = NSRunningApplication.runningApplications(withBundleIdentifier: m).first { + app.activate(options: []) + return + } + NSWorkspace.shared.runningApplications.first { $0.localizedName == m }?.activate(options: []) } func windowWillClose(_ n: Notification) { lukket() } diff --git a/mcp-server/index.js b/mcp-server/index.js index 46a44b18..8e317d5a 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -1836,7 +1836,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => { const a = request.params.arguments || {}; const klient = server.getClientVersion?.()?.name; if (klient) statusKlient(klient); - statusHandling(liveTekst(navn, a), 'running'); + // D3 (2/10): raa app-streng videre til foelg-panelets "Show me where"-knap - + // se status.js' statusHandling for hvorfor den IKKE sloeges op her. + statusHandling(liveTekst(navn, a), 'running', typeof a.app === 'string' ? a.app : null); let svar; try { svar = await iKald(() => haandterKald(request)); diff --git a/mcp-server/status.js b/mcp-server/status.js index 53d7b52d..3fdef9d8 100644 --- a/mcp-server/status.js +++ b/mcp-server/status.js @@ -70,9 +70,15 @@ export function statusStart({ session, client, version }) { } /// En handling er begyndt, eller afvist foer den begyndte. -export function statusHandling(tekst, udfald) { +/// `maal` (D3, 2/10): den raa app-streng mennesket/modellen navngav (bundle-id +/// ELLER synligt navn - begge forekommer i `args.app`). Sendes videre uprøvet: +/// at SLÅ den op (resolveApp) her ville lægge et ekstra helper-opslag på HVER +/// handling bare for at fodre følg-panelets knap. Ikonet forsøger selv begge +/// former, naar mennesket klikker "Show me where" - aldrig agenten selv. +export function statusHandling(tekst, udfald, maal = null) { if (!tilstand) return; - const post = { ts: new Date().toISOString(), text: String(tekst).slice(0, 160), outcome: udfald }; + const post = { ts: new Date().toISOString(), text: String(tekst).slice(0, 160), outcome: udfald, + target: maal ? String(maal).slice(0, 200) : null }; tilstand.recent.push(post); if (tilstand.recent.length > HISTORIK) tilstand.recent.shift(); tilstand.now = udfald === 'running' ? post : null; diff --git a/test/status-ikon.mjs b/test/status-ikon.mjs index 7f852f4e..82dc8df3 100644 --- a/test/status-ikon.mjs +++ b/test/status-ikon.mjs @@ -78,6 +78,15 @@ check('...og at det blev afvist', /⊘ .*Type \d+ characters/.test(liveA), liveA const liveB = d1.live.find(t => t.startsWith('chat-beta')) || ''; check('en laesning staar ogsaa, som ✓', /✓ .*apps/.test(liveB), liveB.split('\n')[2]); +// D3 (2/10): foelg-panelets "Show me where"-knap laeser det raa maal fra --dump, +// uden en levende GUI. chat-alfa's eneste handling navngav 'Notes'. +const alfaIdx = d1.items.findIndex(i => i.startsWith('chat-alfa')); +check('det seneste maal naar frem til --dump (D3, "Show me where")', + d1.nowTarget[alfaIdx] === 'Notes', JSON.stringify(d1.nowTarget)); +const betaIdx = d1.items.findIndex(i => i.startsWith('chat-beta')); +check('...og en handling UDEN app giver null, ikke en tom streng', + d1.nowTarget[betaIdx] === null, JSON.stringify(d1.nowTarget)); + // 3. Det tastede maa ikke staa nogen steder ikonet kan se. const filer = readdirSync(join(STATE, 'sessions')).map(f => readFileSync(join(STATE, 'sessions', f), 'utf8')).join('\n'); check('det tastede staar ikke i statusfilerne', !filer.includes(HEMMELIG), `${filer.length} tegn gennemsoegt`); From 391d9584e91f6e31ab0bf9ae80e5beab2f110935 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 14:43:43 +0800 Subject: [PATCH 061/132] =?UTF-8?q?vejledning:=20canvas-blinde=20apps=20ra?= =?UTF-8?q?pporterer=20tilbage,=20g=C3=A6tter=20ikke=20selv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Opus-panelets punkt (b) (2/10, canvas-fallback-panelet): den eneste agent-guidede vej for en app der ikke udgiver noget til tilgængeligheds- træet (spil, plotte-værktøjer, fjernskrivebord) er nu at tage ÉT afgrænset skærmbillede, beskrive hvad man ser, og give trinnet til mennesket via computer_ask_user - ikke gætte koordinater selv. Ingen ny mekanik: samme værktøjer, bare en instruktion om hvornår de bruges. Panelets øvrige anbefalinger: (a) knapErFarlig fail-closed for blinde klik - rettet i f22496a. (c) "ret READMEs upræcise citat" - falsk alarm, den faktiske README.md:37-45 er allerede ordret præcis; fejlen var i min egen PAKKE.md-opsummering, ikke i produktet. --- mcp-server/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mcp-server/index.js b/mcp-server/index.js index 8e317d5a..05166828 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -185,6 +185,13 @@ When a step did nothing - the next route (measured 27-28 Sep): asks it to show one; if the app pulls itself forward the front is handed back. - Nothing is found in an app you just saw: check \`computer_windows\` - the window may have been closed. +- \`computer_find\` finds nothing anywhere in an app that draws its own controls + on a canvas (some games, some plotting tools, some remote-desktop windows): + take one \`computer_screenshot\` of that app only, describe what you see, and + hand the step to the person with \`computer_ask_user\` - do not guess + coordinates from the image yourself. A canvas is also where the accessibility + layer cannot black out a password field, so the person - never you - decides + if that screenshot is safe to take. - Whichever it was, write it down with \`computer_learning\`: the route that failed and the one that worked. That is how this tool gets better. From a46c6a30e7df5657dad4ce7729d9a0529ca2026a Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 14:59:45 +0800 Subject: [PATCH 062/132] =?UTF-8?q?sync-tal.py:=20FORBEHOLD-linjeskiftet?= =?UTF-8?q?=20forsvandt=20efter=20lukkemark=C3=B8ren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fundet af forside-chatten (2/10): `hale.rstrip('\n')` gjorde `hale` ALTID tom ('\n'.rstrip('\n') == ''), uanset om linjen ovenfor havde regnet sig frem til enkelt eller dobbelt linjeskift. og teksten der fulgte landede på samme linje - GitHub og npm viste markøren som rå tekst ("**Look:** `computer_pending` ·" stod bogstaveligt i README.md). Rettelsen fjerner blot .rstrip('\n') - `hale` var allerede den rigtige streng (smart enkelt/dobbelt alt efter om der i forvejen fulgte en tom linje), den skal bare bruges som den er. Kørt to gange i træk: anden kørsel rapporterer "flader rettet: 0 af 29" (idempotent, som scriptets egen kommentar kræver). Fem flader rettet: README.md, mcp-server/README.md (afledt), docs/index.html, docs/tools.html, docs/llms.txt, docs/llms-install.md. --- README.md | 4 +++- docs/index.html | 4 +++- docs/llms-install.md | 4 +++- docs/llms.txt | 4 +++- docs/tools.html | 4 +++- mcp-server/README.md | 4 +++- scripts/sync-tal.py | 9 ++++++++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4de1f22c..3b7b4ec1 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,9 @@ refusal turns into a free pass, which is how we know the test can fail. > **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 32 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. -**Look:** `computer_pending` · `computer_screenshot` · `computer_record` · `computer_inspect` · `computer_find` · + + +**Look:** `computer_pending` · `computer_screenshot` · `computer_record` · `computer_inspect` · `computer_find` · `computer_wait_for` · `computer_focused` · `computer_apps` · `computer_windows` · `computer_permissions` · `computer_displays` · `computer_menus` · `computer_audit` · `computer_learning` diff --git a/docs/index.html b/docs/index.html index 5c966f58..530e8fb4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -184,7 +184,9 @@

What still asks, and

Install

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 32 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

-

Add it to your MCP client, grant two macOS permissions, done. It starts ready to work: twenty-five of the thirty-two, no asking, except your password manager, anything that deletes or clears, and starting a screen recording. It runs in the background by default, so nothing takes your screen; CMCP_BACKGROUND=0 adds the seven that do.

+ + +

Add it to your MCP client, grant two macOS permissions, done. It starts ready to work: twenty-five of the thirty-two, no asking, except your password manager, anything that deletes or clears, and starting a screen recording. It runs in the background by default, so nothing takes your screen; CMCP_BACKGROUND=0 adds the seven that do.

diff --git a/docs/llms-install.md b/docs/llms-install.md index dd5f74d0..69e878fc 100644 --- a/docs/llms-install.md +++ b/docs/llms-install.md @@ -14,7 +14,9 @@ no network calls of its own. > **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 32 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. -The design premise is that it is safe to leave running: password fields are blacked out in memory + + +The design premise is that it is safe to leave running: password fields are blacked out in memory before a screenshot is written to disk, writes go through a consent gate, and every action lands in a log the server only appends to - every line carries a fingerprint of itself and the one before it, so a removed or edited line breaks the chain and says where that never stores typed text in clear. diff --git a/docs/llms.txt b/docs/llms.txt index 93e643bb..a272e2e1 100644 --- a/docs/llms.txt +++ b/docs/llms.txt @@ -9,7 +9,9 @@ VERSION: npx serves 0.1.0, which has 12 tools. The 32 tools described below the source: they are built and tested but not published yet. Do not tell a user that a tool is available after an npx install unless it is one of the twelve. -# /FORBEHOLDInstall: `npx @agent360/computer-mcp` (ships a signed universal binary; no Swift needed) +# /FORBEHOLD + +Install: `npx @agent360/computer-mcp` (ships a signed universal binary; no Swift needed) Repository: https://github.com/Agent360dk/computerMCP npm: @agent360/computer-mcp Registry name: io.github.Agent360dk/computer-mcp diff --git a/docs/tools.html b/docs/tools.html index 01c02127..930ba32b 100644 --- a/docs/tools.html +++ b/docs/tools.html @@ -75,7 +75,9 @@

Tool reference

What you get today, honestly. npx @agent360/computer-mcp currently serves 0.1.0, which has 12 tools. The 32 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now.

-
+ + +

The one habit that matters. Find things by name, not by pixel. computer_inspect and computer_find return the frame of every element, so the agent can act on "the Log in button" rather than on a coordinate that stops being true the moment a window moves. Reach for computer_click only when there is no accessibility element to aim at: a canvas, a map, an image.

diff --git a/mcp-server/README.md b/mcp-server/README.md index 2c8f67fc..449ed50c 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -216,7 +216,9 @@ refusal turns into a free pass, which is how we know the test can fail. > **What you get today, honestly.** `npx @agent360/computer-mcp` currently serves **0.1.0**, which has 12 tools. The 32 tools described here are the source: they are built and tested, but not published yet. Building from source takes about thirty-five seconds if you want them now. -**Look:** `computer_pending` · `computer_screenshot` · `computer_record` · `computer_inspect` · `computer_find` · + + +**Look:** `computer_pending` · `computer_screenshot` · `computer_record` · `computer_inspect` · `computer_find` · `computer_wait_for` · `computer_focused` · `computer_apps` · `computer_windows` · `computer_permissions` · `computer_displays` · `computer_menus` · `computer_audit` · `computer_learning` diff --git a/scripts/sync-tal.py b/scripts/sync-tal.py index 4418b12e..ede10598 100755 --- a/scripts/sync-tal.py +++ b/scripts/sync-tal.py @@ -236,9 +236,16 @@ def _forbehold(fil, udgivet, n): # aendrede noget. En mekanik der ikke kan koeres to gange uden # forskel, er ikke idempotent - og saa kan man ikke se hvad der er # ens arbejde og hvad der er scriptets stoej. + # ⛔ FUNDET AF FORSIDE-CHATTEN (2/10): `.rstrip('\n')` her gjorde `hale` + # ALTID tom ('\n'.rstrip('\n') == ''), uanset hvad linjen ovenfor lige + # havde regnet ud. Linjeskiftet efter lukkemarkøren forsvandt, så + # og det der fulgte stod på samme linje - GitHub + # og npm viste markøren som rå tekst i stedet for en skjult HTML- + # kommentar. `hale` er allerede den rigtige streng; den skal bruges + # som den er, ikke strippes. hale = '\n' if t3[m3.end():].startswith('\n') else '\n\n' ny3 = (t3[:m3.start()] + aaben + '\n' + _forbehold(f, UDGIVET, N) + '\n' - + luk + hale.rstrip('\n') + t3[m3.end():]) + + luk + hale + t3[m3.end():]) if ny3 != t3: io.open(p3,'w',encoding='utf-8').write(ny3) print((' forbeholdet sat ind igen: ' if not indhold else ' forbeholdet skrevet om: ') + f) From ac7da21b52de2f3eba8b4b522883e08349e8fdc5 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 20:09:43 +0800 Subject: [PATCH 063/132] =?UTF-8?q?sikkerhed:=20knapErFarlig=20var=20for?= =?UTF-8?q?=20bred=20-=20almindelige=20klik=20begyndte=20at=20sp=C3=B8rge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To regressioner fundet af CI samme dag som fail-closed-rettelsen (f22496a): 1. test/sende-port.mjs q9: et klik på en navnløs AXGroup (helt almindeligt layout-lag i Electron-apps) begyndte at spørge. Rettet ved at genbruge send-portens egen `navnSender`-sondring: kun en rolle der plausibelt ER en knap (ukendt, Button, Image, Unknown) kan overhovedet hedde "Delete" - en gruppe kan ikke. 2. test/e2e-forloeb.mjs "click --app tager ikke skaermen": et klik på en helt almindelig, navngivet NSButton ("klik-maal", fundet af computer_find sekunder før) blev afvist. Målt årsag: `at`-punktopslaget fejlede med AX- fejl -25200 ("did not say who owns that point") - en kendt, almindelig AX-kvirk, ikke kun et canvas/fjernskrivebord-symptom som Opus-panelet antog. At spørge ved hver forekomst ville gøre computer_click næsten ubrugeligt. Rettet: `at` svarer stadig med hvilket program der ejer punktet selv når elementet ikke kan slås op - matcher det programmet kaldet selv navngav (targetBundleId, allerede opslået, intet nyt kald), er det ikke Opus' "jeg aner ikke hvad jeg rammer". Verificeret lokalt (sikkert, ingen af dem rører en rigtig skærm): knap-ord (ny case 9), sende-port, e2e-forloeb, klik-ejer, argumenter, baggrund-stille, failclosed, server-e2e, claims - alle grønne. Derudover: lille grammatikrettelse i sync-tal.py's llms.txt-tekst, fundet af forside-chatten ("described below the source" -> "described below are the source"). --- docs/llms.txt | 2 +- mcp-server/index.js | 39 +++++++++++++++++++++++++++++++++------ scripts/sync-tal.py | 2 +- test/knap-ord.mjs | 11 ++++++++++- 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/docs/llms.txt b/docs/llms.txt index a272e2e1..8b94cfc0 100644 --- a/docs/llms.txt +++ b/docs/llms.txt @@ -6,7 +6,7 @@ > log that only grows. No account, no API key, no model inside it. MIT. # FORBEHOLD -VERSION: npx serves 0.1.0, which has 12 tools. The 32 tools described below +VERSION: npx serves 0.1.0, which has 12 tools. The 32 tools described below are the source: they are built and tested but not published yet. Do not tell a user that a tool is available after an npx install unless it is one of the twelve. # /FORBEHOLD diff --git a/mcp-server/index.js b/mcp-server/index.js index 05166828..d64c6af1 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -485,7 +485,30 @@ async function menuGenvejErFarlig(app, path) { /// dialog, et fjernskrivebord, et navnløst element). README's løfte holdt ikke /// på den vej: et "Delete" kunne rammes blindt uden at nogen blev spurgt. Et /// punkt vi ikke kan identificere, er nu farligt - spørg, fail CLOSED. -async function knapErFarlig(name, args) { +/// ⛔ RETTET samme dag (CI, test/sende-port.mjs q9): den første udgave spurgte +/// ved ETHVERT navnløst element, inklusiv en navnløs AXGroup - et helt +/// almindeligt, harmløst layout-lag i Electron-apps. Sende-portens EGEN +/// `navnSender` har allerede løst præcis dette (runde 2, Fable 2 - se +/// kommentaren der): kun en rolle der plausibelt ER en knap (ukendt, eller +/// Button/Image/Unknown) kan overhovedet VÆRE et "Slet", så kun DEN +/// rolle-klasse spørger når navnet mangler. En gruppe kan ikke hedde "Delete". +/// ⛔ RETTET samme dag igen (CI, test/e2e-forloeb.mjs "click --app tager ikke +/// skaermen"): `at`-opslaget svarede `found:false` PAA EN HELT ALMINDELIG, +/// navngivet NSButton ("klik-maal") - maalt fejl -25200, "the accessibility +/// layer did not say who owns that point". `computer_find` havde fundet +/// samme knap sekunder foer. Et mislykket PUNKT-opslag er altsaa en kendt, +/// almindelig AX-kvirk - ikke kun canvas/fjernskrivebord, som Opus-panelet +/// antog. At spoerge VED HVER forekomst ville goere computer_click næsten +/// ubrugeligt. `at` svarer stadig med `under` (hvilket program der ejer +/// punktet) selv naar det specifikke element ikke kan slaas op. Det er det +/// rigtige skel: kender vi i det mindste APPEN klikket selv sigter efter +/// (targetBundleId, allerede opslaaet af kaldet ovenfor - intet nyt opslag), +/// er det IKKE Opus' "jeg aner ikke hvad jeg rammer" - spørg kun når punktet +/// tilhører et ANDET program end det kaldet navngav, eller slet intet kendt. +function kanVaereKnap(rolle) { + return !rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle)); +} +async function knapErFarlig(name, args, targetBundleId) { if (name === 'computer_press') { try { const { a, soeg } = trykArgv(args); @@ -497,10 +520,14 @@ async function knapErFarlig(name, args) { if (name === 'computer_click' && Number.isFinite(args.x) && Number.isFinite(args.y)) { try { const d = await callHelper(['at', '--x', String(args.x), '--y', String(args.y)], { timeout: 8000 }); - if (!d?.found) return true; - const navne = [d.title, d.description].filter(Boolean); - if (!navne.length) return true; - return navne.some(n => menuSerFarlig(n)); + if (d?.found) { + const navne = [d.title, d.description].filter(Boolean); + if (!navne.length) return kanVaereKnap(d.role); + return navne.some(n => menuSerFarlig(n)); + } + const ejer = (d?.under || [])[0] || null; + if (!ejer) return true; + return targetBundleId ? ejer !== targetBundleId : true; } catch { return true; } } return false; @@ -1564,7 +1591,7 @@ async function haandterKald(request) { const menuFarlig = name === 'computer_menu' && effektivTier !== TIER.READ && (menuSerFarlig(args.path) || await menuGenvejErFarlig(args.app, args.path)); const knapFarlig = (name === 'computer_press' || name === 'computer_click') && effektivTier !== TIER.READ - && await knapErFarlig(name, args); + && await knapErFarlig(name, args, targetBundleId); const verdict = name === 'computer_ask_user' ? (currentMode() === 'readonly' diff --git a/scripts/sync-tal.py b/scripts/sync-tal.py index ede10598..fdb1565c 100755 --- a/scripts/sync-tal.py +++ b/scripts/sync-tal.py @@ -197,7 +197,7 @@ def _forbehold(fil, udgivet, n): .replace('npx @agent360/computer-mcp', 'npx @agent360/computer-mcp') + '

') if fil.endswith('.txt'): - return (f'VERSION: npx serves {udgivet}, which has 12 tools. The {n} tools described below\n' + return (f'VERSION: npx serves {udgivet}, which has 12 tools. The {n} tools described below are\n' f'the source: they are built and tested but not published yet. Do not tell a user\n' f'that a tool is available after an npx install unless it is one of the twelve.') return '> **What you get today, honestly.** ' + lang diff --git a/test/knap-ord.mjs b/test/knap-ord.mjs index 72535329..514c5a5c 100644 --- a/test/knap-ord.mjs +++ b/test/knap-ord.mjs @@ -81,7 +81,16 @@ await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); check('8 opslaget selv fejler: klikket sker IKKE uden et ja', klikket() === f); writeFileSync(STUB, stubKilde); -check('9 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); +// ⛔ RETTET samme dag (CI fandt det, test/sende-port.mjs q9): en navnløs +// AXGroup er et helt almindeligt layout-lag, ikke en mulig "Slet"-knap - +// kun roller der plausibelt ER en knap (ukendt, Button, Image, Unknown) +// spørger når navnet mangler. Uden denne sondring spurgte porten på HVERT +// navnløst klik, også harmløse - for bredt. +writeFileSync(AT, JSON.stringify({ ok: true, found: true, bundleId: 'com.apple.TextEdit', role: 'AXGroup' })); f = klikket(); +await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); +check('9 fundet uden navn, men rollen er en harmløs gruppe: klikket sker UDEN at spørge', klikket() === f + 1); + +check('10 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); srv.kill(); console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From 0ff9db6f6c9fd957a99dce36ab68a7308ce4c408 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 20:14:46 +0800 Subject: [PATCH 064/132] =?UTF-8?q?CMCP=5FFILM=5FPYNT:=20ren=20optagelse?= =?UTF-8?q?=20til=20forsiden,=20uden=20at=20r=C3=B8re=20et=20eneste=20tjek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forside-chatten bad om en optagelse af parallel-prøvens 10-runde der kan stå på computermcp.dev uden "menneske.txt"/"m0 m1 m2", Netflix' ophavsretlige plakater, eller et sort skrivebord med Game Center-popup. CMCP_FILM_PYNT=1 (kun via workflow_dispatch, aldrig på push) skifter: - test/parallel.mjs: filnavnet til notes.txt, og teksten der "skrives" fra "m$i " til en kort, cyklende huskeliste (Buy milk, Call Alex, ...) - samme --app-vej, samme forsøgt/verificeret-tælling, samme loop-struktur. - test/brugsscenarier.mjs: scenarie 5's URL/titel-match fra netflix.com til en neutral Wikipedia-artikel (macOS) - scenariets navn, nummer og app-liste er UÆNDREDE, kun destinationen skifter. - fremmed-mac.yml: sætter en rigtig desktop-baggrund (det første .heic koereren rent faktisk har) og bedste forsøg på at tie Game Center/ notifikationer, FØR optagelsen - alt med `|| true`, fejler aldrig bygningen. Verificeret lokalt (sikkert - ingen GUI/skærm rørt): node --check begge filer, SCENARIER.length stadig 19 med og uden flaget, scenarie 5's navn/apps uændret. --- .github/workflows/fremmed-mac.yml | 20 ++++++++++++++++++++ test/brugsscenarier.mjs | 9 ++++++++- test/parallel.mjs | 19 ++++++++++++++++--- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fremmed-mac.yml b/.github/workflows/fremmed-mac.yml index bd84a39d..2e104c88 100644 --- a/.github/workflows/fremmed-mac.yml +++ b/.github/workflows/fremmed-mac.yml @@ -18,6 +18,10 @@ on: description: 'Kør på hele macOS-matrixen (Intel + Apple Silicon, begge GA-versioner) i stedet for kun macos-15' type: boolean default: false + film_pynt: + description: 'Ren optagelse til forsiden (2/10, forside-chatten): notes.txt+almindelige ord, neutral side i stedet for Netflix, normalt skrivebord, Game Center tavs. Rører ALDRIG tjekkene.' + type: boolean + default: false jobs: # ⛔ A6 (1/10): "macos-14 + macos-15, Intel + Apple Silicon" er forældet ordlyd - @@ -50,6 +54,7 @@ jobs: env: CMCP_FREMMED_MASKINE: '1' CMCP_STATUS_IKON: '0' + CMCP_FILM_PYNT: ${{ inputs.film_pynt && '1' || '' }} steps: - uses: actions/checkout@v4 @@ -59,6 +64,21 @@ jobs: defaults read -g AppleLanguages || true ls /Applications + # Pynt til forsiden (2/10, forside-chatten): kun KAMERAET's billede ændrer + # sig her - rører intet tjek. Alt er best-effort og fejler aldrig bygningen + # (`|| true` overalt): en koerer uden netop den defaults-noegle skal stadig + # kunne koere resten af suiten. + - name: Pynt til forsiden + if: ${{ inputs.film_pynt }} + run: | + PIC=$(ls "/System/Library/Desktop Pictures/"*.heic 2>/dev/null | head -1) + if [ -n "$PIC" ]; then + osascript -e "tell application \"Finder\" to set desktop picture to POSIX file \"$PIC\"" || true + fi + defaults write com.apple.gamed GKAutoSignInEnabled -bool false 2>/dev/null || true + defaults -currentHost write com.apple.notificationcenterui doNotDisturb -bool true 2>/dev/null || true + killall NotificationCenter 2>/dev/null || true + # Samme bygning som udgivelsen: hjaelperen til begge arkitekturer OG # menulinje-ikonet (koersel 3: statusikon-proeven fandt intet ikon). - name: Byg som udgivelsen diff --git a/test/brugsscenarier.mjs b/test/brugsscenarier.mjs index 0bde029a..f9191453 100644 --- a/test/brugsscenarier.mjs +++ b/test/brugsscenarier.mjs @@ -38,6 +38,11 @@ import { startFilm } from './film.mjs'; const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const AEGTE = join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper'); process.env.CMCP_STATUS_IKON = '0'; // aldrig det rigtige ikon i menneskets menulinje +// PYNT (2/10, forside-chatten): kun scenarie 5's URL/titel skifter - samme tjek, +// samme scenarie-nummer, samme browserSide()-mekanik. Netflix' plakater er +// ophavsretligt beskyttede; en ren optagelse til computermcp.dev bruger en +// neutral side i stedet. +const PYNT = process.env.CMCP_FILM_PYNT === '1'; const vent = (ms) => new Promise(r => setTimeout(r, ms)); const tilfaeldig = () => Math.random().toString(36).slice(2, 8); @@ -322,7 +327,9 @@ export const SCENARIER = [ return `bonden er flyttet: «${m[0].name}»`; }, }, - browserSide(5, 'åbne Netflix', 'https://www.netflix.com/', /Netflix/), + PYNT + ? browserSide(5, 'åbne Netflix', 'https://en.wikipedia.org/wiki/MacOS', /macOS/) + : browserSide(5, 'åbne Netflix', 'https://www.netflix.com/', /Netflix/), { // ⛔ 27/9 på en fremmed Mac: tryk på «Wallpaper» i sidebjælken er tryk på en // tekst og skifter ingen side, og vinduets titel er tom. Indstillinger har diff --git a/test/parallel.mjs b/test/parallel.mjs index 7bff65dd..8967e699 100644 --- a/test/parallel.mjs +++ b/test/parallel.mjs @@ -36,6 +36,10 @@ const vent = (ms) => new Promise(r => setTimeout(r, ms)); // (Lommeregner, Skak, Aktivitetsovervaagning, Finder laest). Maalet: kom NOGEN af // agenternes programmer frem foran ham - hvert 100. ms, hele vejen. const FREMMED = process.env.CMCP_FREMMED_MASKINE === '1'; +// PYNT (2/10, forside-chatten): rører KUN hvad kameraet viser - filnavn og tekstens +// ord. Rører ALDRIG tjekkene: samme forsoegt/verificeret-taelling, samme scenarie- +// valg, samme antal agenter. Kun til en ren optagelse til computermcp.dev. +const PYNT = process.env.CMCP_FILM_PYNT === '1'; const EGEN = !FREMMED && process.env.CMCP_PARALLEL_EGEN_MAC === '1'; if (!FREMMED && !EGEN) { console.log('SPR. saet CMCP_FREMMED_MASKINE=1 (GitHubs Mac) eller CMCP_PARALLEL_EGEN_MAC=1 (din egen Mac, mens du arbejder)'); @@ -66,7 +70,7 @@ const HJ = join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper'); const hj = (...a) => JSON.parse(execFileSync(HJ, a, { encoding: 'utf8', timeout: 10000 })); function startMenneske() { const d = mkdtempSync(join(tmpdir(), 'cmcp-parallel-')); - const fil = join(d, 'menneske.txt'); + const fil = join(d, PYNT ? 'notes.txt' : 'menneske.txt'); writeFileSync(fil, ''); // ⛔ 1/10 (koersel 36890103580): SIGKILL alene hjalp ikke - traef-tallet voksede // staedigt 2 -> 3 -> 4 paa tvaers af runderne, ALDRIG nulstillet, praecis det @@ -113,10 +117,19 @@ function startMenneske() { // stoler paa - hvert kalds EGEN «verified»-bekraeftelse - i stedet for et skroebeligt // `find`-opslag efter det hele er overstaaet. const log = join(d, 'skrevet.txt'), tael = join(d, 'taelling.txt'), stop = join(d, 'stop'), sidsteSvar = join(d, 'sidste-svar.json'); + // PYNT (2/10): kun ORDET der tastes skifter - samme loekke, samme --app-vej, + // samme verified-taelling. "ord[$((i % N))]" cykler en kort huskeliste i + // stedet for "m$i " - checken laeser aldrig selve teksten, kun tael/sidsteSvar. + const skrivLinje = PYNT + ? `ord=(Buy milk Call Alex Book flights Walk the dog Read a book Water the plants Send the invoice Pack lunch Charge the laptop Reply to Sam) + w="\${ord[$((i % \${#ord[@]}))]} " + R=$("${HJ}" type --app com.apple.TextEdit --text "$w" 2>&1)` + : `w="m$i " + R=$("${HJ}" type --app com.apple.TextEdit --text "$w" 2>&1)`; const p = spawn('bash', ['-c', `i=0; v=0; while [ ! -f "${stop}" ]; do - R=$("${HJ}" type --app com.apple.TextEdit --text "m$i " 2>&1) + ${skrivLinje} printf '%s' "$R" > "${sidsteSvar}" - if printf '%s' "$R" | grep -q '"verified":true'; then v=$((v+1)); printf "m$i " >> "${log}"; fi + if printf '%s' "$R" | grep -q '"verified":true'; then v=$((v+1)); printf '%s' "$w" >> "${log}"; fi i=$((i+1)); sleep 0.12 done printf '%s %s' "$i" "$v" > "${tael}"`], { stdio: 'ignore' }); From 2aece3dea449d6819a36fa8fc9aa2c446c55bfb5 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 20:45:19 +0800 Subject: [PATCH 065/132] =?UTF-8?q?bevis.sh:=20"ikke=20skubbet"=20m=C3=A5l?= =?UTF-8?q?te=20mod=20origin/main,=20ikke=20husets=20egen=20PR-gren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fundet under fuld-review af denne chats arbejde (2/10): kortet meldte "64 commits ligger lokalt", selvom alt var skubbet til origin/proeve/rettelser-2026-09-28. Lokal main tracker origin/main (git config), men husets egen deploy-doktrin pusher til en proeve/-gren via PR - main er LÅST (computermcp_main_laast). Tjekket målte sin egen hardcodede antagelse, ikke den faktiske push-tilstand. Rettet: er HEAD med på NOGEN fjern-gren (git branch -r --contains HEAD), er den skubbet - og kortet navngiver hvilken. Verificeret: viser nu korrekt "HEAD er på origin/proeve/rettelser-2026-09-28". --- tools/bevis.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/bevis.sh b/tools/bevis.sh index f73ca241..0ae81427 100755 --- a/tools/bevis.sh +++ b/tools/bevis.sh @@ -48,9 +48,15 @@ if [ "$UDGIVET" = "UMAALT" ]; then umaalt "npm" "kunne ikke naas" elif [ "$UDGIVET" = "$KILDE" ]; then ja "npm = kilden" "$UDGIVET" else nej "npm er bagud" "npx giver $UDGIVET, kilden er $KILDE"; fi -FORAN=$(git rev-list origin/main..HEAD --count 2>/dev/null || echo 0) -if [ "$FORAN" = "0" ]; then ja "alt er skubbet" "0 commits foran origin" -else nej "ikke skubbet" "$FORAN commits ligger lokalt"; fi +## ⛔ FUNDET under fuld-review 2/10: hardcoded mod origin/main gav falsk "ikke +## skubbet" på 64 commits - lokal main tracker origin/main (git config), men +## husets EGNE workflow pusher til en proeve/-gren via PR (main er LÅST, +## skub via PR). Tjekket maalte sin egen antagelse, ikke virkeligheden. +## Nu: er HEAD med på NOGEN fjern-gren, er den skubbet - navngiv hvilken. +git fetch origin --quiet 2>/dev/null || true +PAA_GREN=$(git branch -r --contains HEAD 2>/dev/null | grep -v ' -> ' | sed 's/^ *//' | head -1) +if [ -n "$PAA_GREN" ]; then ja "alt er skubbet" "HEAD er på $PAA_GREN" +else nej "ikke skubbet" "HEAD findes på ingen fjern-gren"; fi CI=$(gh run list -R Agent360dk/computerMCP -w CI --limit 20 --json headSha,conclusion \ -q "[.[] | select(.headSha==\"$(git rev-parse HEAD)\")] | .[0].conclusion" 2>/dev/null) From 46e3cdc4ae424fc74505153a7474bd03bccb8650 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 21:01:37 +0800 Subject: [PATCH 066/132] =?UTF-8?q?sikkerhed:=20fjern=20targetBundleId-und?= =?UTF-8?q?tagelsen=20-=20den=20gen=C3=A5bnede=20Opus'=20fund?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uafhængigt review-security-review (2/10, efter fuld-review-skillets Trin 5) fandt at ac7da21's "punktet tilhører den app kaldet selv navngav"-undtagelse (F1, Critical, confidence 90) genåbner PRÆCIS det Opus-panelet fandt: et fjernskrivebord eller en VM ejer sit eget vindue legitimt, men AX-laget kan ALDRIG se ind i det - "under" matcher altid "app" derinde. At kende APPEN er ikke det samme som at kende ELEMENTET. Prøvede først et genforsøg (en ægte AX-kvirk burde være forbigående) - MÅLT at svigte empirisk: samme AX-fejl -25200 to gange i træk på den samme, helt almindelige NSButton fra test/e2e-forloeb.mjs. Kvirken er ikke timing, og der er ingen billig måde at skelne "en almindelig knap AX tilfældigvis ikke kan slå op" fra "et fjernskrivebord der aldrig kan slås op" med kun ét punkt-opslag. Efter tre runder der hver rettede ét symptom og genåbnede et andet, er den disciplinerede løsning den simpleste sikre: `found:false` spørger ALTID, uden undtagelse - computer_click bliver dyrere på kendte AX-kvirke, og den pris er betalt med vilje. test/e2e-forloeb.mjs's "klik-maal"-knap rammes nu korrekt af spørgsmålet; testens forventning er opdateret til at afspejle den sikrere, sande opførsel (og "sent"-effektens dækning flyttet til test/klik-ejer.mjs, hvor den allerede proves med et ja). Dette er FJERDE version af knapErFarlig i dag (07a4a8f-serien, f22496a, ac7da21, nu denne). Resten af review-security's fund (F2 nameless AXLink/ AXStaticText, F3 click-through på dækket vindue, F5 press fail-open på timeout, F6-F11) er IKKE rettet i denne omgang - rapporteret, ikke skjult. Verificeret lokalt: knap-ord (9/9), sende-port, klik-ejer, e2e-forloeb (32/32), argumenter, baggrund-stille, failclosed, server-e2e, claims - alle grønne. Q26-mutantens anker matcher igen koden uændret. --- mcp-server/index.js | 44 +++++++++++++++++++++++--------------------- test/e2e-forloeb.mjs | 34 +++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/mcp-server/index.js b/mcp-server/index.js index d64c6af1..dcb4570b 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -494,21 +494,27 @@ async function menuGenvejErFarlig(app, path) { /// rolle-klasse spørger når navnet mangler. En gruppe kan ikke hedde "Delete". /// ⛔ RETTET samme dag igen (CI, test/e2e-forloeb.mjs "click --app tager ikke /// skaermen"): `at`-opslaget svarede `found:false` PAA EN HELT ALMINDELIG, -/// navngivet NSButton ("klik-maal") - maalt fejl -25200, "the accessibility -/// layer did not say who owns that point". `computer_find` havde fundet -/// samme knap sekunder foer. Et mislykket PUNKT-opslag er altsaa en kendt, -/// almindelig AX-kvirk - ikke kun canvas/fjernskrivebord, som Opus-panelet -/// antog. At spoerge VED HVER forekomst ville goere computer_click næsten -/// ubrugeligt. `at` svarer stadig med `under` (hvilket program der ejer -/// punktet) selv naar det specifikke element ikke kan slaas op. Det er det -/// rigtige skel: kender vi i det mindste APPEN klikket selv sigter efter -/// (targetBundleId, allerede opslaaet af kaldet ovenfor - intet nyt opslag), -/// er det IKKE Opus' "jeg aner ikke hvad jeg rammer" - spørg kun når punktet -/// tilhører et ANDET program end det kaldet navngav, eller slet intet kendt. +/// navngivet NSButton ("klik-maal") - maalt fejl -25200. Forsøgte da at lade +/// "punktet tilhører den app kaldet selv navngav" (targetBundleId === under) +/// tælle som harmløst. +/// ⛔ RETTET EN TREDJE GANG (review-security, 2/10, Critical, confidence 90): +/// den rettelse genåbnede PRÆCIS det Opus-panelet fandt. Et fjernskrivebord +/// eller en VM ejer sit eget vindue legitimt - "under" matcher ALTID "app" +/// derinde, for hele pointen med en RDP-klient er at AX-laget aldrig kan se +/// ind i den. At kende APPEN er ikke det samme som at kende ELEMENTET. +/// Prøvede derefter et genforsøg 150ms senere (en ægte AX-kvirk burde være +/// forbigående, et opaque fjernskrivebord ville fejle igen) - MÅLT at +/// svigte: samme -25200 to gange i træk på den samme knap. Kvirken er ikke +/// timing. Der er ingen billig måde at skelne "en helt almindelig knap AX +/// tilfældigvis ikke kan slå op" fra "et fjernskrivebord der aldrig kan +/// slås op" med kun ÉT punkt-opslag - så der gættes ikke mere. `found:false` +/// spørger nu ALTID, uden undtagelse. computer_click bliver dyrere på en +/// kendt AX-kvirk (test/e2e-forloeb.mjs's egen "klik-maal"-knap rammes af +/// den) - det er prisen for at lukke hullet, og den er betalt med vilje. function kanVaereKnap(rolle) { return !rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle)); } -async function knapErFarlig(name, args, targetBundleId) { +async function knapErFarlig(name, args) { if (name === 'computer_press') { try { const { a, soeg } = trykArgv(args); @@ -520,14 +526,10 @@ async function knapErFarlig(name, args, targetBundleId) { if (name === 'computer_click' && Number.isFinite(args.x) && Number.isFinite(args.y)) { try { const d = await callHelper(['at', '--x', String(args.x), '--y', String(args.y)], { timeout: 8000 }); - if (d?.found) { - const navne = [d.title, d.description].filter(Boolean); - if (!navne.length) return kanVaereKnap(d.role); - return navne.some(n => menuSerFarlig(n)); - } - const ejer = (d?.under || [])[0] || null; - if (!ejer) return true; - return targetBundleId ? ejer !== targetBundleId : true; + if (!d?.found) return true; + const navne = [d.title, d.description].filter(Boolean); + if (!navne.length) return kanVaereKnap(d.role); + return navne.some(n => menuSerFarlig(n)); } catch { return true; } } return false; @@ -1591,7 +1593,7 @@ async function haandterKald(request) { const menuFarlig = name === 'computer_menu' && effektivTier !== TIER.READ && (menuSerFarlig(args.path) || await menuGenvejErFarlig(args.app, args.path)); const knapFarlig = (name === 'computer_press' || name === 'computer_click') && effektivTier !== TIER.READ - && await knapErFarlig(name, args, targetBundleId); + && await knapErFarlig(name, args); const verdict = name === 'computer_ask_user' ? (currentMode() === 'readonly' diff --git a/test/e2e-forloeb.mjs b/test/e2e-forloeb.mjs index b6fdc012..53b9366d 100644 --- a/test/e2e-forloeb.mjs +++ b/test/e2e-forloeb.mjs @@ -176,16 +176,23 @@ try { midte = (JSON.parse(kf.tekst).matches || []).find(m => /orden-3/.test(JSON let klikMidte = null; try { klikMidte = (JSON.parse(kf.tekst).matches || []).find(m => /klik-maal/.test(JSON.stringify(m)))?.center; } catch {} if (klikMidte) { + // ⛔ RETTET (review-security, 2/10): denne knap er navngivet og helt + // almindelig ("klik-maal"), men maaler alligevel en KENDT AX-kvirk: punkt- + // opslaget (`at`) svarer found:false her (fejl -25200), gentagne gange, + // malt empirisk. Foer dette fund blev et saadant klik lukket igennem + // stille - noejagtig den samme fejlklasse som README's "Delete" paa et + // fjernskrivebord. Nu spoerger et klik der ikke kan identificeres, ALTID - + // ogsaa paa en helt harmloes knap. Attrap-spoergeren her svarer aldrig + // (`udloeb`), saa klikket afvises - det ER den sikre, korrekte opfoersel. + // Det fulde "menneske siger ja, klikket lander"-forloeb er allerede + // bevist andetsteds med en rigtig ja-spoerger (test/knap-ord.mjs, + // test/sende-port.mjs). const k = await kald('computer_click', { app: BID, x: klikMidte.x, y: klikMidte.y }); - trin('haender+', 'click --app tager ikke skaermen', !k.fejl && /pointer stayed/.test(k.tekst), k.tekst.slice(0, 60)); - // «It does not pretend»: svaret maa IKKE paastaa at klikket lykkedes. - trin('haender+', '...og paastaar ikke at klikket landede', /NOT verified/.test(k.tekst) && !/^Clicked at/.test(k.tekst), - k.tekst.slice(0, 60)); - await new Promise(r => setTimeout(r, 700)); - const efterK = await kald('computer_inspect', { app: BID }); - // ⛔ UMAALT indtil nu. Rapporteres som maaling, ikke som paastand. - const landede = /KLIKKET/.test(efterK.tekst); - console.log(`\n MAALING · landede klikket? ${landede ? 'JA' : 'NEJ'} - ${landede ? 'knappen skiftede titel' : 'knappen hedder stadig klik-maal'}`); + // Samme afvisnings-moenster som "adgangskode-program afvises" ovenfor: + // baggrundstilstand naegter en handling der kraever spoergsmaal, foer den + // overhovedet naar frem til en spoerger. + trin('haender+', 'et klik der ikke kan identificeres, spoerger - ogsaa paa en harmloes knap (AX-kvirk)', + k.fejl && /this would need a dialog/.test(k.tekst), k.tekst.slice(0, 90)); } else if (midte) { trin('haender+', 'click --app (kunne ikke finde en knap at sigte paa)', false, kf.tekst.slice(0, 60)); } @@ -245,9 +252,14 @@ trin('log', 'took_screen staar i loggen', /took_screen/.test(log.tekst), (log.te // ⛔ Konsulenten 22/9: loggen sagde «ok» om baade «vi sendte det» og «det // virkede». Nu staar der hvad vi FAKTISK ved: verified (laest efter), // performed (programmet udfoerte den) eller sent (afleveret, udfald ukendt). +// ⛔ RETTET (review-security, 2/10): «sent» kom tidligere KUN fra klikket paa +// «klik-maal» - det klik spoerger nu altid (se ovenfor), saa denne proeve +// naar aldrig frem til at taelle «sent» i DENNE frisk server. Selve +// effect-vaerdien er stadig i brug og proevet andetsteds, med en rigtig +// ja-spoerger (test/klik-ejer.mjs "9a kalibrering ... Clicked at 700, 50"). const eff = [...log.tekst.matchAll(/"effect": "(\w+)"/g)].map(m => m[1]); -trin('log', 'loggen skelner «sendt» fra «virkede»', - eff.includes('verified') && eff.includes('performed') && eff.includes('sent'), +trin('log', 'loggen skelner mindst «verified» fra «virkede» («sent» proeves med et ja i test/klik-ejer.mjs)', + eff.includes('verified') && eff.includes('performed'), eff.length ? [...new Set(eff)].join(', ') : 'intet effect-felt'); srv.kill(); attrap.kill(); From 2ba02e62753818007eba1e2eab2587a8b9bbfd51 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 21:53:44 +0800 Subject: [PATCH 067/132] rettet mutationsbevis: navnSender's klik-gren var en kopi af kanVaereKnap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI (46e3cdc) fejlede på mutant R3-ukendt-rolle-ufarlig: "1 overlevede, 0 fejl" - en ægte overlevelse, ikke en instrument-fejl. Målt årsag: navnSender's klik-rolle-tjek var en ord-for-ord kopi af knapErFarlig's kanVaereKnap() (bevidst genbrugt mønster, se f22496a). To uafhængige kopier af samme logik betyder at en mutation i navnSender's egen kopi blev maskeret - knapErFarlig spurgte stadig, af sin EGEN grund, så den observerede opførsel ("spurgte den?") var uændret uanset mutationen. Rettet ved at fjerne duplikeringen: navnSender's klik-gren kalder nu kanVaereKnap(rolle) direkte i stedet for at gentage udtrykket. Én kilde, én mutation rammer begge porte - og rammer nu BEGGE porte's prøver (verificeret: mutanten gør både sende-port.mjs OG knap-ord.mjs røde). Mutant R3's anker opdateret til den delte funktions linje. Verificeret lokalt: mutationen anvendt manuelt → begge testfiler røde på den forventede linje → gendannet → begge grønne igen i deres normale tilstand. --- .github/mutanter-porte.json | 4 ++-- mcp-server/index.js | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 9f61c512..dd4f0f16 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -564,8 +564,8 @@ "fil": "mcp-server/index.js", "par": [ [ - " return klik ? (!rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle)))", - " return klik ? /^AX(Button|Image)$/.test(String(rolle))" + " return !rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle));", + " return /^AX(Button|Image)$/.test(String(rolle));" ] ], "proeve": "test/sende-port.mjs", diff --git a/mcp-server/index.js b/mcp-server/index.js index dcb4570b..a52c768f 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -587,7 +587,13 @@ async function sendeDom(name, args, bid) { if (n) return SENDE_ORD.test(n); // Runde 3 (Astra 3): en UKENDT rolle er ogsaa ved et klik en mulig send - kun // en KENDT ufarlig rolle (fx AXGroup) er undtaget. - return klik ? (!rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle))) : (!rolle || /^AX(Button|Image|Group|Unknown|Link)$/.test(String(rolle))); + // ⛔ 2/10: klik-grenen her var en ORD-FOR-ORD kopi af knapErFarlig's + // kanVaereKnap() (samme mønster genbrugt bevidst). To kopier af samme + // logik betyder at en mutation i den ene maskeres af den anden - MÅLT: + // mutant R3-ukendt-rolle-ufarlig overlevede, fordi knapErFarlig stadig + // spurgte af sin EGEN grund. Kalder nu den delte funktion direkte - + // én kilde, én mutation rammer begge gates' prøver. + return klik ? kanVaereKnap(rolle) : (!rolle || /^AX(Button|Image|Group|Unknown|Link)$/.test(String(rolle))); }; let knapVindue = null, knapRamme = null, erKontrol = false; let sender = false; From 420b99800642fa4fbfbbeb7081c004e7d72b57b2 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 22:15:23 +0800 Subject: [PATCH 068/132] udgivelse: ret to konkrete fejl fundet af Astra+Opus panelet 2/10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - udgiv-npm.yml: opsætnings-kommentaren sagde "Environment: (tom)" til Gustav, i modstrid med jobbets egen "environment: udgivelse" og husets låste beslutning (computermcp_main_laast_2026_09_29). Ville have fået npm OIDC til at afvise tokenet pga. environment-claim-mismatch ved første rigtige publish-forsøg. - release.sh: fjernet gen-indsættelse af værktøjstal i repo-beskrivelsen - tallet blev bevidst fjernet 2/10 fordi det var forkert mod både koden og npm; scriptet ville have sat den forkerte værdi tilbage ved næste udgivelse. Begge fund verificeret selv mod koden før rettelse, ikke taget for pålydende fra panelrapporterne. Ingen af de to kræver en beslutning - de retter kode til at stemme med fakta der allerede er afgjort. --- .github/workflows/udgiv-npm.yml | 6 +++++- scripts/release.sh | 13 ++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/udgiv-npm.yml b/.github/workflows/udgiv-npm.yml index 4f771954..9328d971 100644 --- a/.github/workflows/udgiv-npm.yml +++ b/.github/workflows/udgiv-npm.yml @@ -27,7 +27,11 @@ name: Udgiv til npm # Provider: GitHub Actions # Repository: Agent360dk/computerMCP # Workflow: udgiv-npm.yml -# Environment: (tom) +# Environment: udgivelse +# (skal matche jobbets "environment: udgivelse" nedenfor - ellers afviser +# npm OIDC-tokenet, fordi dets environment-claim ikke matcher det +# registrerede. Rettet 2/10 - stod tidligere som "(tom)", i modstrid med +# jobbets egen linje og den låste beslutning om at binde til "udgivelse".) # # Derefter: ingen token, ingen engangskode, ingen udloeb. Nogensinde. # --------------------------------------------------------------------------- diff --git a/scripts/release.sh b/scripts/release.sh index a19e073b..fa35cc7a 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -294,14 +294,9 @@ echo "== 7/7 MCP-registret ==" # fire steder». Hvert skridt for sig, og en fejl er en fejl. mcp-publisher login github || { echo "⛔ login til MCP-registret fejlede - npm ER udgivet, registret er IKKE"; exit 1; } mcp-publisher publish || { echo "⛔ MCP-registret afviste udgivelsen - npm ER udgivet, registret er IKKE"; exit 1; } -# ⛔ Y4c. Repo-beskrivelsen er den streng hvert katalog hoester. Staar der et -# vaerktoejstal, skal det aendres i SAMME oejeblik som pakken - ikke foer -# (saa lyver den for npx-brugere) og ikke efter (saa lyver den for alle). -DESC=$(gh api repos/Agent360dk/computerMCP --jq .description 2>/dev/null) -case "$DESC" in - *" $N tools"*) echo " ✓ repo-beskrivelsen siger allerede $N" ;; - *) echo " ⚠️ repo-beskrivelsen siger ikke '$N tools' - ret den nu:" - echo " gh repo edit Agent360dk/computerMCP --description \"...$N tools...\"" ;; -esac +# ⛔ Fjernet 2/10: et vaerktoejstal i repo-beskrivelsen blev bevidst fjernet +# 2/10, fordi tallet var forkert baade mod koden og mod npm. Dette script +# genindsatte det ved hver udgivelse - en regression mod den beslutning. +# Repo-beskrivelsen roeres ikke her laengere. echo "✅ $V er ude fire steder. Tjek: npm view @agent360/computer-mcp version" From b18485444450abc5104c08257af3c81ea777a8a6 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 22:45:05 +0800 Subject: [PATCH 069/132] mutant Q9-navnloes-gruppe-er-send: anker peger ikke paa levende kode mere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI på 2ba02e6 fejlede ægte: "Q9-navnloes-gruppe-er-send: ankrene findes [0] gange" - dedup-refaktoreringen i 2ba02e6 (navnSender kalder nu kanVaereKnap direkte i stedet for sin egen inline-kopi) fjernede den tekst mutanten søgte efter. 0 mutanter overlevede; dette var en knækket anker, ikke en reel fejl. Retarget til kanVaereKnap's funktionskrop (samme sted R3-ukendt-rolle-ufarlig peger), med sin egen mutation (tilføjer Group i stedet for at fjerne Unknown) så den stadig beviser noget andet end R3. Mutationsbevist manuelt begge veje før push: muteret → test/sende-port.mjs gik rødt netop på "q9 klik paa en navnloes gruppe" (den påstand mutanten selv hedder) → gendannet → git diff tom → baseline grøn igen. knap-ord.mjs upåvirket. --- .github/mutanter-porte.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index dd4f0f16..d01c8377 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -516,8 +516,8 @@ "fil": "mcp-server/index.js", "par": [ [ - " return klik ? (!rolle || /^AX(Button|Image|Unknown)$/", - " return klik ? (!rolle || /^AX(Button|Image|Unknown|Group)$/" + " return !rolle || /^AX(Button|Image|Unknown)$/.test(String(rolle));", + " return !rolle || /^AX(Button|Image|Unknown|Group)$/.test(String(rolle));" ] ], "proeve": "test/sende-port.mjs", From 0e6274540b05c7c96e297f097905f1273d6ccbab Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 23:16:13 +0800 Subject: [PATCH 070/132] udgivelse: ret tre fejl i faerdiggoer-udgivelsen.sh (Astra+Opus 2/10) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Tilføjet eksplicit "mcp-publisher login" før publish, som to-vejs-skridt (samme rettelse release.sh allerede har - set -e dækker ikke en &&-kæde). - Registerkontrollen kunne matche en FREMMED server ved navn-overlap i søgningen; kræver nu præcis navn "io.github.Agent360dk/computer-mcp" OG sammenligner med den faktisk udgivne version. Selvtestet mod det ægte, læsende registerkald (0.1.0 matcher, 0.2.1 rapporteres som uoverensstemmelse). - Scriptets sidste trin anbefalede "git push origin main" - afvises altid, main kræver PR (enforce_admins=true, bekræftet). Erstattet med en gren + gh pr create-vej. Ingen CI-vagt kører dette script (grep-bekræftet); ingen risiko for porten. Intet kørt - kun scriptets egen tekst og logik rettet. --- tools/faerdiggoer-udgivelsen.sh | 43 +++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/tools/faerdiggoer-udgivelsen.sh b/tools/faerdiggoer-udgivelsen.sh index fbe45b99..9d659a3b 100755 --- a/tools/faerdiggoer-udgivelsen.sh +++ b/tools/faerdiggoer-udgivelsen.sh @@ -31,15 +31,35 @@ if [ "$PAA_NPM" != "$VENTET" ]; then fi sig "1 · MCP-registret" +# ⛔ ASTRA (2/10): login og publish skal vaere to skridt, ikke et &&-kaedet - +# samme fejlklasse som release.sh allerede retter (set -e gaelder ikke i en &&-kaede). if command -v mcp-publisher >/dev/null 2>&1; then + mcp-publisher login github || { echo " login til registret fejlede"; faldt=1; } mcp-publisher publish || { echo " registret afviste - se ovenfor"; faldt=1; } else echo " mcp-publisher findes ikke lokalt; henter den engangs" + npx -y @modelcontextprotocol/publisher login github || { echo " login til registret fejlede"; faldt=1; } npx -y @modelcontextprotocol/publisher publish || { echo " registret afviste"; faldt=1; } fi -echo -n " registret siger nu: " +echo -n " registret siger for VORES server ($VENTET ventet): " +# ⛔ ASTRA (2/10): søgningen kan matche en FREMMED server ved navn-overlap - +# maalt med et syntetisk svar der gav en anden servers 9.9.9. Kraev praecis +# navn, og sammenlign med den version vi faktisk lige udgav. curl -s "https://registry.modelcontextprotocol.io/v0/servers?search=computer-mcp" \ - | python3 -c "import json,sys;d=json.load(sys.stdin);print(next((e['server']['version'] for e in d.get('servers',[]) if e.get('_meta',{}).get('io.modelcontextprotocol.registry/official',{}).get('isLatest')),'(ikke fundet)'))" + | python3 -c " +import json, sys +NAVN = 'io.github.Agent360dk/computer-mcp' +VENTET = '$VENTET' +d = json.load(sys.stdin) +fundet = [e for e in d.get('servers', []) + if e.get('server', {}).get('name') == NAVN + and e.get('_meta', {}).get('io.modelcontextprotocol.registry/official', {}).get('isLatest')] +if not fundet: + print('(ikke fundet under det praecise navn)'); sys.exit(1) +v = fundet[0]['server']['version'] +print(v) +sys.exit(0 if v == VENTET else 1) +" || faldt=1 sig "2 · forbeholdene sletter sig selv" echo "$VENTET" > PUBLICERET @@ -60,10 +80,19 @@ sig "5 · i hus" git add PUBLICERET README.md docs/ server.json 2>/dev/null || true git status --short | sed 's/^/ /' echo -echo " Naeste skridt er i haanden, med vilje:" -echo " git commit -F - <<'M'" -echo " udgivet: $VENTET staar paa npm, forbeholdene er vaek" -echo " M" -echo " git push origin main" +# ⛔ OPUS (2/10): main er laast (PR kraeves, enforce_admins=true) - en direkte +# "git push origin main" afvises altid, ogsaa for en administrator. +if [ -n "$(git status --porcelain -- PUBLICERET README.md docs/ server.json 2>/dev/null)" ]; then + GREN="udgivelse-$VENTET-dok" + echo " Naeste skridt er i haanden, med vilje (main er laast - en direkte push bliver afvist):" + echo " git checkout -b $GREN" + echo " git commit -F - <<'M'" + echo " udgivet: $VENTET staar paa npm, forbeholdene er vaek" + echo " M" + echo " git push origin $GREN" + echo " gh pr create --base main --head $GREN --title \"udgivet: $VENTET - forbeholdene vaek\" --body \"npm og registret bekraeftet paa $VENTET; PUBLICERET og de afledte sider er synkroniseret af sync-tal.py.\"" +else + echo " intet at committe - PUBLICERET og siderne stod allerede rigtigt." +fi [ "$faldt" -eq 0 ] && sig "ALT GROENT" || { sig "NOGET FALDT - se ovenfor"; exit 1; } From f460c15930bf44db009e5648d77ccaaeea491612 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 2 Oct 2026 23:18:32 +0800 Subject: [PATCH 071/132] =?UTF-8?q?udgivelse:=20release.sh=20skubbede=20al?= =?UTF-8?q?tid=20forg=C3=A6ves=20eller=20forkert=20til=20protected=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tre fund, alle Opus 2/10, verificeret selv mod branch-beskyttelsen (gh api .../branches/main/protection, bekræftet enforce_admins=true): 1. Intet tjek for at lokalt HEAD faktisk er origin/main FØR der tagges. Køres scriptet i et træ hvis lokale main er bagud (målt i en anden chats træ: stod på 46e3cdc), ville det offentlige mærke v$V pege på en commit GitHub ikke har - permanent forkert, mærker omskrives ikke uden historik- brud. Tilføjet et hårdt stop før trin 0. 2. "git push origin main --tags" (linje ~254) forsøgte at skubbe "main" for et skridt der kun handler om mærket - meningsløst når HEAD nu er verificeret synkron, og ville være blevet afvist af beskyttelsen hvis det alligevel ikke var. Skubber nu kun mærket. 3. Efter en VIRKELIG npm-udgivelse (irreversibel, fælden allerede afvæbnet) prøvede scriptet samme afviste "git push origin main" for at synkronisere PUBLICERET/docs - et set -e-stop her ville have efterladt Gustav i en uklar tilstand midt i en udgivelse. Erstattet med gren + automatisk PR; scriptet fortæller præcis hvilken PR der skal merges, uden selv at merge den. Intet af dette rammer CI (grep-bekræftet: ingen workflow eller test udfører scripts/release.sh - kun build-release.sh, en anden fil). bash -n ren. --- scripts/release.sh | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index fa35cc7a..0b154750 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -50,6 +50,22 @@ if [ -n "$(git status --porcelain)" ]; then exit 1 fi +# ⛔ OPUS (2/10): uden dette tjek kan lokal main staa paa en commit origin/main +# IKKE har (fx en anden chats traee) - scriptet ville taenke HEAD'en v$V, +# skubbe maerket offentligt paa en forkert commit, og saa faa SELVE +# main-pushet nedenfor afvist af branch-beskyttelsen. Maerket ville alligevel +# staa derude, forkert. Stop foer noget som helst skubbes. +git fetch origin main --quiet +HEAD_NU="$(git rev-parse HEAD)" +ORIGIN_MAIN="$(git rev-parse origin/main)" +if [ "$HEAD_NU" != "$ORIGIN_MAIN" ]; then + echo "⛔ HEAD ($HEAD_NU) er ikke det samme som origin/main ($ORIGIN_MAIN)." + echo " Udgivelsen maerker og pakker HEAD - er den ikke identisk med origin/main," + echo " maerkes/pakkes en commit GitHub ikke har endnu (eller en forkert én)." + echo " git checkout main && git pull - og koer saa scriptet igen." + exit 1 +fi + echo "== 0/7 teksten skal beskrive DEN version vi udgiver ==" echo "$V" > "$ROOT/PUBLICERET" python3 "$ROOT/scripts/sync-tal.py" | sed 's/^/ /' @@ -251,7 +267,11 @@ echo "== 5/7 maerk og skub FOER der udgives ==" # fortrydes, foerst. npm whoami >/dev/null 2>&1 || { echo "⛔ npm-tokenen er ikke gyldig. Gustav skal lave en ny (2FA)."; exit 1; } git tag -a "v$V" -m "v$V" -git push origin main --tags +# ⛔ OPUS (2/10): "main" her var meningsløst OG farligt - HEAD er lige verificeret +# identisk med origin/main ovenfor, saa der er intet nyt at skubbe til main; +# og en protected branch afviser alligevel et direkte "push origin main". +# Det eneste dette skridt reelt skal skubbe, er maerket. +git push origin "refs/tags/v$V" # ⛔ 25/9 (Astra): her stod `... 2>/dev/null || echo "(fandtes i forvejen)"` - enhver # fejl (login, netvaerk, rettigheder) blev meldt som at udgivelsen fandtes. if gh release view "v$V" >/dev/null 2>&1; then @@ -282,10 +302,28 @@ echo " PUBLICERET staar paa $V, og forbeholdet er fjernet fra alle flader." # Kun de filer sync-tal aendrede - traeet var rent foer vi startede. AENDREDE=$(git status --porcelain | awk '{print $2}') if [ -n "$AENDREDE" ]; then + # ⛔ OPUS (2/10): "git push origin main" her blev altid afvist - main er + # protected (PR kraeves, enforce_admins=true). Faelden er allerede afvaebnet + # (npm ER udgivet), saa et set -e-stop her ville efterlade en uklar + # halvfaerdig tilstand. En gren + PR er det eneste der rent faktisk virker. + GREN="release-$V-dok" + git checkout -q -b "$GREN" git add $AENDREDE git commit -q -m "release: $V er udgivet - PUBLICERET og siderne foelger med" - git push origin main - echo " ✓ PUBLICERET og siderne committet og skubbet" + git push -q origin "$GREN" + if PR_URL=$(gh pr create --base main --head "$GREN" \ + --title "release: $V er udgivet - forbeholdene vaek" \ + --body "npm og GitHub-udgivelsen for $V er allerede ude (irreversibelt). Denne PR synkroniserer kun PUBLICERET og de afledte sider - ingen ny funktionalitet." \ + 2>&1); then + echo " ✓ PUBLICERET og siderne committet, skubbet til $GREN:" + echo " $PR_URL" + echo " Merge den PR for at faa teksten med paa main - npm-udgivelsen venter ikke paa den." + else + echo "⛔ PR-opret fejlede, men commit'en og grenen er skubbet og trygge:" + echo "$PR_URL" | sed 's/^/ /' + echo " Aabn PR'en i haanden: gh pr create --base main --head $GREN" + fi + git checkout -q main fi echo "== 7/7 MCP-registret ==" From 77ba8b65571736d2bfd530a4c9f947dc96328415 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 3 Oct 2026 00:16:53 +0800 Subject: [PATCH 072/132] sikkerhed F5: computer_press delte klikkets gamle fail-open-fejl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit review-security fandt det (F5, Important), en søsterchats Astra+Opus-panel genfandt og verificerede det selv i koden (420b998, index.js:517-524) og Gustav gav ja til at rette den nu, resten af review-security-fundene som kendt risiko (forbrugeragent-3e, 2/10). Verificeret selv mod den faktiske kode før rettelse: knapErFarlig's klik-gren blev gjort fail-closed i dag (46e3cdc) - `catch { return true; }`, `if (!d?.found) return true;`. Press-grenen gjorde præcis det modsatte - `catch { return false; }` og et manglende would_press talte som "ufarligt". Samme fejlklasse: et mislykket opslag læst som "ved besked" i stedet for "ved ikke", nøjagtig den antagelse F1 lukkede for klik i dag. Rettet til samme fail-closed-regel som klik, ingen undtagelse. To nye prøver (knap-ord.mjs 11-12: manglende would_press, og selve dry-run-kaldet fejler) plus to mutanter (Q27, Q28) - mutationsbevist manuelt begge veje FØR commit, og hele den lokale mutationssuite kørt bagefter: 0 overlevede, 0 fejl (74 mutanter inkl. de to nye). test/sende-port.mjs og test/e2e-forloeb.mjs upåvirkede. Co-Authored-By: Claude Sonnet 5 --- .github/mutanter-porte.json | 24 ++++++++++++++++++++++++ mcp-server/index.js | 9 +++++++-- test/knap-ord.mjs | 14 +++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index d01c8377..bdfd46e7 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -862,5 +862,29 @@ " if (!d?.found) return false;" ] ] + }, + { + "navn": "Q27-tryk-fejler-aabent", + "fil": "mcp-server/index.js", + "proeve": "test/knap-ord.mjs", + "forventet": "11 dry-run finder intet", + "par": [ + [ + " if (!el) return true;", + " if (!el) return false;" + ] + ] + }, + { + "navn": "Q28-toerkoersel-fejler-aabent", + "fil": "mcp-server/index.js", + "proeve": "test/knap-ord.mjs", + "forventet": "12 selve toerkoerslen fejler", + "par": [ + [ + " return [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n));\n } catch { return true; }", + " return [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n));\n } catch { return false; }" + ] + ] } ] diff --git a/mcp-server/index.js b/mcp-server/index.js index a52c768f..f2584d47 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -516,12 +516,17 @@ function kanVaereKnap(rolle) { } async function knapErFarlig(name, args) { if (name === 'computer_press') { + // ⛔ review-security F5 (2/10), Gustav ja: samme fejlklasse som klikkets F1 i dag - + // et mislykket opslag blev laest som "ufarligt", ikke som "ved ikke". Et + // tidsudloeb paa toerkoerslen fortaeller intet om hvad et AEGTE tryk ville + // ramme - fail-closed, som klikket allerede goer, ingen undtagelse. try { const { a, soeg } = trykArgv(args); const d = await callHelper([...a, '--dry'], { stdin: JSON.stringify(soeg), timeout: 15000 }); const el = d?.would_press; - return !!el && [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n)); - } catch { return false; } + if (!el) return true; + return [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n)); + } catch { return true; } } if (name === 'computer_click' && Number.isFinite(args.x) && Number.isFinite(args.y)) { try { diff --git a/test/knap-ord.mjs b/test/knap-ord.mjs index 514c5a5c..0e3d3b32 100644 --- a/test/knap-ord.mjs +++ b/test/knap-ord.mjs @@ -90,7 +90,19 @@ writeFileSync(AT, JSON.stringify({ ok: true, found: true, bundleId: 'com.apple.T await kald('computer_click', { app: 'com.apple.TextEdit', x: 10, y: 10 }); check('9 fundet uden navn, men rollen er en harmløs gruppe: klikket sker UDEN at spørge', klikket() === f + 1); -check('10 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); +// ⛔ review-security F5 (2/10), Gustav ja: samme klasse fejl som klikkets F1 i dag, +// bare paa tryk-grenen - et mislykket toerkoersels-opslag blev laest som "ufarligt". +writeFileSync(KNAP, JSON.stringify({ ok: true })); f = trykket(); +await kald('computer_press', { app: 'com.apple.TextEdit', title: 'Hvad Som Helst' }); +check('11 dry-run finder intet at trykke (intet would_press): trykket sker IKKE uden et ja (fail closed)', trykket() === f); + +const stubKilde2 = readFileSync(STUB, 'utf8'); +writeFileSync(STUB, stubKilde2.replace(/^ press\) case.*$/m, ' press) exit 1 ;;')); f = trykket(); +await kald('computer_press', { app: 'com.apple.TextEdit', title: 'Noget' }); +check('12 selve toerkoerslen fejler: trykket sker IKKE uden et ja (fail closed)', trykket() === f); +writeFileSync(STUB, stubKilde2); + +check('10 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7, 8, 11 og 12', spoerger.gangeSpurgt() === 8, `spurgt ${spoerger.gangeSpurgt()} gange`); srv.kill(); console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From 0a9658abd088c4a4a11189170a55ad1b991beb04 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 5 Oct 2026 07:35:16 +0530 Subject: [PATCH 073/132] =?UTF-8?q?test:=20skriv-ankommer=203c=20ventede?= =?UTF-8?q?=20p=C3=A5=20en=20g=C3=A6ttet=20tid,=20ikke=20p=C3=A5=20bevis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit review (5/10, forbrugeragent-3e's fund + egen undersøgelse): 3c dumpede lokalt med typed=0, did:[] - en fast 2,5 s-timer før SIGUSR1 racede mod opstartsforsinkelsen på en travl maskine, så fokus-skiftet kunne ske FØR det første tegn blev skrevet. Fixturens egen kommentar (proevemaal.swift:147) siger præcis hvornår signalet skal sendes: "naar skrivningen er i gang" - testen gættede i stedet på en fast tid. Rettet til at vente på selve beviset: feltet() (allerede brugt andetsteds i filen) læser feltets værdi tilbage; loopet venter til den ikke er tom, højst 6 sekunder, før SIGUSR1 sendes. En ægte regression (skrivning starter aldrig) dumper stadig efter 6 s - intet er skjult. Ingen produktkode ændret, kun test-timingen. Kan ikke køre denne test lokalt (den tager et rigtigt vindue og rigtige tastetryk på denne Mac) - node --check er syntakstjekket, CI beviser den for alvor. Co-Authored-By: Claude Sonnet 5 --- test/skriv-ankommer.mjs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/skriv-ankommer.mjs b/test/skriv-ankommer.mjs index f5847416..9a220841 100644 --- a/test/skriv-ankommer.mjs +++ b/test/skriv-ankommer.mjs @@ -79,7 +79,18 @@ try { const p = spawn(HJAELPER, ['type', '--app', skift, '--keystrokes', '--cps', '5', '--text', 'a'.repeat(40)]); let ud = ''; p.stdout.on('data', (d) => { ud += d; }); p.on('close', () => { try { res(JSON.parse(ud)); } catch { res({ ok: false, error: ud.slice(0, 200) }); } }); - setTimeout(() => fiks.kill('SIGUSR1'), 2500); + // ⛔ RETTET 5/10: ventede FOER paa en fast 2,5 s, som racede mod opstarts- + // forsinkelsen paa en travl maskine (maalt: typed=0, did:[] - signalet naaede + // feltet foer det foerste tegn gjorde). Fixturens egen kommentar siger + // praecis hvornaar: «naar skrivningen er i gang» - saa vent paa BEVIS + // (feltet er ikke tomt), ikke paa en gaettet tid. Naar skrivningen aldrig + // starter, udloeber dette efter 6 s og proeven dumper som foer - en aegte + // regression skjules ikke. + (async () => { + const frist = Date.now() + 6000; + while (Date.now() < frist && !feltet(skift)) await new Promise((r) => setTimeout(r, 50)); + fiks.kill('SIGUSR1'); + })(); }); check('3c fokus der flytter ind i et kodeordsfelt undervejs stopper skrivningen dér', r3c.ok === false && r3c.code === 'secure-field' && r3c.typed > 0 && r3c.typed < 40, JSON.stringify(r3c).slice(0, 180)); From 02b3d29dea931b3a8f03970a38fbc1dca12fe390 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 6 Oct 2026 15:42:48 +0200 Subject: [PATCH 074/132] =?UTF-8?q?sikkerhed/tekst:=20README's=20"seven=20?= =?UTF-8?q?others=20ask=20every=20time"=20var=20forkert,=20og=20skal=20nu?= =?UTF-8?q?=20ind=20i=20#6=20F=C3=98R=20npm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gustav ændrede rækkefølgen 6/10: npm udgives FØR hjemmesiden merger (for aldrig at vise "npx serves 0.1.0" live). build-release.sh afleder mcp-server/README.md af dette repos README.md ved udgivelse - så enhver tekstfejl i README.md her fryser permanent ind i den udgivne npm-pakke. Den rettelse der allerede var klar i #7 (hjemmesiden, uafhængig Opus-gennemgang 3/10) rettede netop dette: - Password-apps bliver REFUSED i standardtilstanden (baggrund), ikke "ask every time, in every mode" som README sagde - verificeret direkte i policy.js:517-524 (knapErFarlig/viaIkonet): et farligt program kan aldrig godkendes via menulinjen, kun i forgrund (CMCP_BACKGROUND=0). - "Keychain, 1Password and seven others" skulle være "five others" - ni bundle-ID'er, men tre af dem (onepassword, onepassword7, 1password.1password) er samme produkt. Rettet i samme omgang: test/claims.mjs's egen optælling (42b) talte raa bundle-ID'er og "bestod" kun fordi den delte den forkerte antagelse med README'en - cirkulær, beviste intet. - Windsurf/Zed fjernet fra klient-listen (ikke testet). Da npm nu udgives FØR hjemmesiden (fase 2 kommer bagefter), skal denne rettelse ligge i #6/main, ikke kun i #7 - ellers fryser den forkerte tekst ind i npm-pakken for hele 0.2.1's levetid, uopretteligt uden en ny version. Verificeret før commit, ikke blot kopieret: - README.md-diffen er byte-identisk med #7's allerede gennemgåede tekst (git diff mod 6439c6d, ingen forskel). - mcp-server/README.md regenereret med NETOP den formel claims.mjs's check 45 selv håndhæver (afprøvet lokalt: check45 passes: True). - 42a/42b/42c afprøvet isoleret og lokalt uden at røre skærmen (ren fil- og policy.js-læsning, ingen server, intet rigtigt klik) - alle tre bestod. - 42b's rettelse mutationsbevist begge veje: den gamle raa optælling genindsat midlertidigt → 42b fejlede korrekt (andre=7, teksten siger fem) → gendannet → kun den tilsigtede diff tilbage. Ingen funktionskode ændret - kun tekst og en testoptællings formel. Co-Authored-By: Claude Sonnet 5 --- README.md | 28 +++++++++++++++------------- mcp-server/README.md | 28 +++++++++++++++------------- test/claims.mjs | 13 +++++++++++-- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 3b7b4ec1..fe7fc896 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A macOS computer-use MCP server built for the part everyone skips: what happens in the hours you are not watching. - **It runs in every MCP client, not one app.** Claude Code, Cursor, VS Code, - Codex, Windsurf, Zed, or your own agent - one `npx` line, the same server + Codex, or your own agent - one `npx` line, the same server everywhere. It is not tied to a single vendor's desktop app or plan. - **It does not take over your Mac.** It presses buttons and fills fields in windows that stay behind the one you are in, and it leaves your pointer where @@ -21,8 +21,8 @@ in the hours you are not watching. - **Several can run at once.** No session lock, no one-at-a-time limit. Writes to the shared log take a short file lock, so two servers cannot break the chain between them. -- **It will not go near your passwords.** Keychain, 1Password and seven others - ask every time, in every mode, and password fields are blacked out while the +- **It will not go near your passwords.** Keychain, 1Password and five others + are refused in the default mode (with `CMCP_BACKGROUND=0` they ask every time), and password fields are blacked out while the screenshot is still in memory. A screen recording leaves password managers out, but does not black out password fields. - **You can read back what it did.** Every call lands in an append-only log, @@ -83,11 +83,12 @@ through - so both are checked. **2. The dangerous places ask first.** By default the agent works without interrupting you - that is what lets it run while you do something else - and every write is logged. What never goes through on its own: password managers and -Keychain ask *every single time*, in every mode, and that one is not -configurable. Terminals and editors, where a keystroke can be a command, ask once +Keychain are refused in the default mode, because the menu bar cannot show what +would be typed (with `CMCP_BACKGROUND=0` they ask *every single time*, in every +mode), and that one is not configurable. Terminals and editors, where a keystroke can be a command, ask once per app per session. Quitting an app, closing a window, switching Space, -destructive-looking menu items and any action whose target app cannot be -identified ask every time. The gate judges the app an action lands in: an +and destructive-looking menu items ask every time; an action whose target app +cannot be identified is refused in the default mode. The gate judges the app an action lands in: an app opened some other way - Spotlight, a shortcut - is guarded by what the agent then tries to do in it. Want a dialog before the first write too? Set `CMCP_MODE=ask`. If nobody answers, the answer is no. @@ -155,8 +156,8 @@ the client and check `computer_permissions` again. | `CMCP_MODE` | Behaviour | |---|---| | `readonly` | Write tools are not even listed. The agent can look and cannot touch. | -| `ask` | The first write opens a dialog; one yes grants the session. Password managers still ask every time, terminals and editors once per session. | -| `allow` | **Default.** Writes proceed without asking, still logged. Password managers *still* ask every time, terminals and editors once per session, and in background mode anything that would need a dialog waits in the menu bar instead. | +| `ask` | The first write opens a dialog; one yes grants the session. Password managers are refused (with `CMCP_BACKGROUND=0` they ask every time), terminals and editors ask once per session. | +| `allow` | **Default.** Writes proceed without asking, still logged. Password managers are *still* refused (with `CMCP_BACKGROUND=0` they ask every time), terminals and editors ask once per session, and in background mode anything that would need a dialog waits in the menu bar instead. | `CMCP_ASK_TIMEOUT` (seconds, default 60) controls how long a dialog waits before it refuses. @@ -167,8 +168,9 @@ it refuses. default, and the agent uses them without asking - the same way a browser tool drives a browser. Two gates survive that, and they are the two that matter: -- **Password managers ask every time.** Keychain, 1Password and seven others, - in every mode, even after you have said yes. That is the whole difference +- **Password managers are refused.** Keychain, 1Password and five others, in + every mode, even after you have said yes; with `CMCP_BACKGROUND=0` they ask + every time instead. That is the whole difference between *you may work* and *you may have my passwords*. - **Anything that deletes or clears asks every time**, recognised from the words in the action itself. @@ -282,9 +284,9 @@ Two or more matches is a refusal, not a guess - the agent gets the candidates and has to narrow it down, because pressing the first plausible button is exactly the kind of almost-right action nobody notices afterwards. -The consent dialog still comes to the front, and the apps on the always-ask list +The consent question still reaches you (in the menu bar by default), and the apps on the always-ask list still ask every time. `computer_press` names its target app, and that name is -what the gate judges - so pressing something in 1Password asks even when +what the gate judges - so pressing something in 1Password is refused (with `CMCP_BACKGROUND=0`: asks) even when 1Password is nowhere near the front. **Claude Code's auto mode and the screen tools.** Measured on 1 Oct: after the diff --git a/mcp-server/README.md b/mcp-server/README.md index 449ed50c..c950567e 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -6,7 +6,7 @@ A macOS computer-use MCP server built for the part everyone skips: what happens in the hours you are not watching. - **It runs in every MCP client, not one app.** Claude Code, Cursor, VS Code, - Codex, Windsurf, Zed, or your own agent - one `npx` line, the same server + Codex, or your own agent - one `npx` line, the same server everywhere. It is not tied to a single vendor's desktop app or plan. - **It does not take over your Mac.** It presses buttons and fills fields in windows that stay behind the one you are in, and it leaves your pointer where @@ -19,8 +19,8 @@ in the hours you are not watching. - **Several can run at once.** No session lock, no one-at-a-time limit. Writes to the shared log take a short file lock, so two servers cannot break the chain between them. -- **It will not go near your passwords.** Keychain, 1Password and seven others - ask every time, in every mode, and password fields are blacked out while the +- **It will not go near your passwords.** Keychain, 1Password and five others + are refused in the default mode (with `CMCP_BACKGROUND=0` they ask every time), and password fields are blacked out while the screenshot is still in memory. A screen recording leaves password managers out, but does not black out password fields. - **You can read back what it did.** Every call lands in an append-only log, @@ -81,11 +81,12 @@ through - so both are checked. **2. The dangerous places ask first.** By default the agent works without interrupting you - that is what lets it run while you do something else - and every write is logged. What never goes through on its own: password managers and -Keychain ask *every single time*, in every mode, and that one is not -configurable. Terminals and editors, where a keystroke can be a command, ask once +Keychain are refused in the default mode, because the menu bar cannot show what +would be typed (with `CMCP_BACKGROUND=0` they ask *every single time*, in every +mode), and that one is not configurable. Terminals and editors, where a keystroke can be a command, ask once per app per session. Quitting an app, closing a window, switching Space, -destructive-looking menu items and any action whose target app cannot be -identified ask every time. The gate judges the app an action lands in: an +and destructive-looking menu items ask every time; an action whose target app +cannot be identified is refused in the default mode. The gate judges the app an action lands in: an app opened some other way - Spotlight, a shortcut - is guarded by what the agent then tries to do in it. Want a dialog before the first write too? Set `CMCP_MODE=ask`. If nobody answers, the answer is no. @@ -153,8 +154,8 @@ the client and check `computer_permissions` again. | `CMCP_MODE` | Behaviour | |---|---| | `readonly` | Write tools are not even listed. The agent can look and cannot touch. | -| `ask` | The first write opens a dialog; one yes grants the session. Password managers still ask every time, terminals and editors once per session. | -| `allow` | **Default.** Writes proceed without asking, still logged. Password managers *still* ask every time, terminals and editors once per session, and in background mode anything that would need a dialog waits in the menu bar instead. | +| `ask` | The first write opens a dialog; one yes grants the session. Password managers are refused (with `CMCP_BACKGROUND=0` they ask every time), terminals and editors ask once per session. | +| `allow` | **Default.** Writes proceed without asking, still logged. Password managers are *still* refused (with `CMCP_BACKGROUND=0` they ask every time), terminals and editors ask once per session, and in background mode anything that would need a dialog waits in the menu bar instead. | `CMCP_ASK_TIMEOUT` (seconds, default 60) controls how long a dialog waits before it refuses. @@ -165,8 +166,9 @@ it refuses. default, and the agent uses them without asking - the same way a browser tool drives a browser. Two gates survive that, and they are the two that matter: -- **Password managers ask every time.** Keychain, 1Password and seven others, - in every mode, even after you have said yes. That is the whole difference +- **Password managers are refused.** Keychain, 1Password and five others, in + every mode, even after you have said yes; with `CMCP_BACKGROUND=0` they ask + every time instead. That is the whole difference between *you may work* and *you may have my passwords*. - **Anything that deletes or clears asks every time**, recognised from the words in the action itself. @@ -280,9 +282,9 @@ Two or more matches is a refusal, not a guess - the agent gets the candidates and has to narrow it down, because pressing the first plausible button is exactly the kind of almost-right action nobody notices afterwards. -The consent dialog still comes to the front, and the apps on the always-ask list +The consent question still reaches you (in the menu bar by default), and the apps on the always-ask list still ask every time. `computer_press` names its target app, and that name is -what the gate judges - so pressing something in 1Password asks even when +what the gate judges - so pressing something in 1Password is refused (with `CMCP_BACKGROUND=0`: asks) even when 1Password is nowhere near the front. **Claude Code's auto mode and the screen tools.** Measured on 1 Oct: after the diff --git a/test/claims.mjs b/test/claims.mjs index 3e275412..15cfa485 100644 --- a/test/claims.mjs +++ b/test/claims.mjs @@ -1824,10 +1824,19 @@ esac check('42a. README udpeger den tilstand koden faktisk starter i', /\*\*Default\.\*\*/.test(raekke), `koden starter i «${standard}»; README-raekken: ${raekke.slice(0, 60) || 'ikke fundet'}`); const ORD = ['zero','one','two','three','four','five','six','seven','eight','nine','ten','eleven','twelve']; - const andre = A42.size - 2; // Keychain og 1Password naevnes ved navn + // ⛔ RETTET 6/10 (sidechatten, uafhaengig Opus-gennemgang @77ba8b6): denne linje + // talte RAA bundle-ID'er - men tre af dem (onepassword, onepassword7, + // 1password.1password) er samme produkt i tre version-skikkelser, ikke tre + // programmer. "A42.size - 2" gav 7, og README's "seven others" bestod kun + // fordi begge sider delte den samme fejl - testen beviste ingenting. + // Det rigtige tal er DISTINKTE PRODUKTER: 7 (Keychain, Apple Passwords, + // 1Password, Bitwarden, LastPass, Dashlane, Secretive), minus de 2 navngivne. + const PRODUKT_GRUPPER = [[/^com\.agilebits\.onepassword\d*$|^com\.1password\.1password$/, '1Password']]; + const distinkteProdukter = new Set([...A42].map(b => PRODUKT_GRUPPER.find(([re]) => re.test(b))?.[1] || b)).size; + const andre = distinkteProdukter - 2; // Keychain og 1Password naevnes ved navn check('42b. antallet af adgangskode-programmer i README stemmer med listen', readme.includes(`1Password and ${ORD[andre]} others`), - `listen har ${A42.size}, saa teksten skal sige «${ORD[andre]} others»`); + `listen har ${distinkteProdukter} distinkte produkter (${A42.size} bundle-ID'er), saa teksten skal sige «${ORD[andre]} others»`); const skjult = T42.size - K42.size; const side = fs42.existsSync(join(ROOT, 'docs/index.html')) ? fs42.readFileSync(join(ROOT, 'docs/index.html'), 'utf8') : ''; check('42c. forsidens tal for skjulte vaerktoejer stemmer', !side || side.includes(`adds the ${ORD[skjult]} that do`), From cb8e118c8ffd81fceb233cd8d49af7b14ceb3ade Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 6 Oct 2026 15:43:59 +0200 Subject: [PATCH 075/132] =?UTF-8?q?tekst:=20serverens=20egen=20AI-instruks?= =?UTF-8?q?=20havde=20samme=20forkerte=20kodeordsp=C3=A5stand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fundet af forbrugeragent-3c (e2e-gennemgang af hele slut-tilstanden 6/10), verificeret selv (grep index.js:202 + syntax-check) før rettelse. VEJLEDNING (teksten modellen selv læser, under "What you will be refused") sagde "they ask every single time, in every mode" - under overskriften "refused", så den modsiger sig selv, og den er forkert af samme grund som README var: i standardtilstanden (baggrund) afvises password-apps, de spørger kun med CMCP_BACKGROUND=0 (policy.js:554-569). Ikke blokerende adfærd - modellen fik allerede en korrekt afvisning med grund - men teksten står i hvert eneste AI-svar fra serveren, og den ligger i selve npm-pakken. Rettet med samme ordlyd som README-rettelsen (02b3d29), for konsistens på tværs af fladerne. Ingen anden forekomst i index.js (grep-bekræftet). Ingen test afhænger af denne tekst (grep-bekræftet). Co-Authored-By: Claude Sonnet 5 --- mcp-server/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mcp-server/index.js b/mcp-server/index.js index f2584d47..79e6b167 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -199,7 +199,8 @@ What you will be refused, and why: - anything that would take the screen while in background mode - the person is working; use the route above instead - the app the person is using right now - wait, or target another app -- password managers and Keychain: they ask every single time, in every mode +- password managers and Keychain: refused in background mode (the default); + with CMCP_BACKGROUND=0 they ask every single time - an unredacted screenshot: that is the person's decision, never the model's - the Computer MCP status icon itself: it is their control surface From 52e55f5f22d902dab60e7d40a7496f7d8b079051 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 6 Oct 2026 15:48:14 +0200 Subject: [PATCH 076/132] tekst: Windsurf-kommentar og Gemini-beskrivelse havde samme to fejl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fundet af forbrugeragent-3c i deres e2e-gennemgang (0bac4b2 på #7), verificeret ordret mod den commit før anvendelse: - README.md:125 (kodekommentar i mcp.json-eksemplet) nævnte stadig Windsurf som klient - ikke testet, allerede fjernet fra siden 2/10. Står i npm-README (afledt igen her, check 45 bekræftet lokalt). - gemini-extension.json: "password managers that ask every time" var samme forkerte påstand som README/index.js allerede var rettet for - password-apps afvises i standardtilstanden (policy.js:554-569), spørger kun med CMCP_BACKGROUND=0. Denne fil er IKKE del af npm-pakken (ikke i mcp-server/package.json's files-liste, verificeret) - lavere hastværk, men rettet alligevel da ordlyden allerede lå klar. Co-Authored-By: Claude Sonnet 5 --- README.md | 2 +- gemini-extension.json | 2 +- mcp-server/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe7fc896..8e130597 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ claude mcp add computer -- npx -y @agent360/computer-mcp ``` ```jsonc -// Cursor, VS Code, Codex CLI, Windsurf - mcp.json +// Cursor, VS Code, Codex CLI - mcp.json { "mcpServers": { "computer": { "command": "npx", "args": ["-y", "@agent360/computer-mcp"] } diff --git a/gemini-extension.json b/gemini-extension.json index 9fe0b48a..b9365ff7 100644 --- a/gemini-extension.json +++ b/gemini-extension.json @@ -1,7 +1,7 @@ { "name": "computer-mcp", "version": "0.2.1", - "description": "Drive macOS from any MCP client with the guardrails on by default: password fields blacked out in memory before the screenshot is written, password managers that ask every time and terminals once per session, and a log the server only appends to that never stores typed text in clear. 32 tools, 14 read-only. No API key, MIT.", + "description": "Drive macOS from any MCP client with the guardrails on by default: password fields blacked out in memory before the screenshot is written, password managers that are refused and terminals that ask once per session, and a log the server only appends to that never stores typed text in clear. 32 tools, 14 read-only. No API key, MIT.", "mcpServers": { "computer": { "command": "npx", diff --git a/mcp-server/README.md b/mcp-server/README.md index c950567e..f4b218ca 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -120,7 +120,7 @@ claude mcp add computer -- npx -y @agent360/computer-mcp ``` ```jsonc -// Cursor, VS Code, Codex CLI, Windsurf - mcp.json +// Cursor, VS Code, Codex CLI - mcp.json { "mcpServers": { "computer": { "command": "npx", "args": ["-y", "@agent360/computer-mcp"] } From 37922a819ba0dd546e597d78ca0661000b72ac31 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Tue, 6 Oct 2026 15:56:23 +0200 Subject: [PATCH 077/132] =?UTF-8?q?WISHLIST:=200.2.2-=C3=B8nske=20-=20menu?= =?UTF-8?q?linje-sp=C3=B8rgsm=C3=A5l=20skal=20kunne=20opdages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gustavs eget ord (6/10, videresendt af forbrugeragent-3c): «Det kan du lægge i computermcp todo». Lavstakket, reversibel dokumentations-ændring, ingen kode rørt, ingen npm-pakkefil ramt (WISHLIST.md er ikke i mcp-server/package.json's files-liste). Indholdet er allerede verificeret direkte i denne session: 20 "nobody answered"-udløb i audit.jsonl (15 heraf computer_request_screen), inklusive to udløb mens Gustav aktivt kørte F1-prøven. Samme tal, genmålt i dag af forbrugeragent-3c til 22 af 23 (opdateret siden). Co-Authored-By: Claude Sonnet 5 --- WISHLIST.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/WISHLIST.md b/WISHLIST.md index aebe931d..13006dc8 100644 --- a/WISHLIST.md +++ b/WISHLIST.md @@ -23,6 +23,21 @@ Nothing from outside yet - the package is two days old. The forms above are the --- +## ⏳ Waiting for 0.2.2 + +- **A menu-bar question has to be noticeable, not just askable.** Measured 6/10 in the audit log: + 23 questions went through the icon, 1 was approved. 22 timed out (15 of them screen-lending), + while a person was sitting at the machine. Screen-lending already has a 5-minute window, measured + separately - the window is not the problem, the question itself is too easy to miss (a colour + change in the menu bar, no sound, no notification). In practice "deletion and sending asks you + first" becomes "refused quietly", and screen-lending cannot be used at all. Proposed: a real + macOS notification (`UNUserNotificationCenter` from `cmcp-status`) naming the app and the action, + with Allow/Deny buttons; a short sound per question; the icon blinking until it is answered; and + a test asserting exactly one notification per question. Measure after shipping: the share of + approved-or-denied versus timed-out menu-bar questions in `audit.jsonl`. + +--- + ## ⏳ Waiting for 0.3.0 - **A running server never tells you it is out of date.** Measured 20/9, and it cost a real day: From 441e22587fffe5fadfbeade415f518a1a533c5a6 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 12:13:43 +0200 Subject: [PATCH 078/132] proever: 22c og sessions-porten maaler reglen, ikke menneskets skaerm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trin 1 paa Gustavs Mac (7/10) gav tre DUMP i to proever, begge groenne paa GitHubs Mac fordi de dér enten sprang over eller ramte et neutralt punkt: - sessions-porten trykkede paa knappen «x», som ikke findes. Siden F5 (77ba8b6) spoerger et tryk uden synligt maal hver gang - med vilje - saa proeven maalte F5-vagten. Den maaler mod det foerste koerende program fra session-listen (her Gustavs IDE); GitHubs Mac har intet og sprang over. Nu svarer `press --dry` fast med en harmloes knap. - 22c slog (11,22) op paa den rigtige skaerm; paa Gustavs Mac er det menulinjen, genmaalingen foer handlingen afviste med rette, og argumenterne blev aldrig maalt. Nu svarer `at` fast med et Finder-vindue. Kun proever. Produktkoden og kvitteringens fingeraftryk (eee5f73df272c8dd) er uaendrede. Mutationsbevist: session-rabatten fjernet -> 3 DUMP; --steps forskudt -> 22c roed. Co-Authored-By: Claude Opus 5.5 --- test/claims.mjs | 7 +++++++ test/sessionsport.mjs | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/test/claims.mjs b/test/claims.mjs index 15cfa485..b66591b5 100644 --- a/test/claims.mjs +++ b/test/claims.mjs @@ -1098,6 +1098,13 @@ esac // En proeve hvis svar afhaenger af hvad der tilfaeldigvis staar forrest // paa en anden persons skaerm, maaler ikke koden. Den her giver samtykke, // saa den kan naa det den paastaar at maale. + // + // ⛔ 7/10: samme klasse en gang til. Punktet (11,22) blev slaaet op paa + // menneskets RIGTIGE skaerm gennem den aegte hjaelper. Paa Gustavs Mac ligger + // det i menulinjen, genmaalingen lige foer handlingen kunne ikke bekraefte et + // vindue, og kaldet blev med rette afvist - saa 22c faldt uden at maale + // argumenterne. Et fast svar paa `at` goer udfaldet uafhaengigt af skaermen. + h22.saetSvar({ at: { found: true, bundleId: 'com.apple.finder', role: 'AXGroup', title: '' } }); const jaAttrap22 = lavFalskSpoerger('ja', 'cmcp-claims22-ja'); const cA = client({ CMCP_MODE: 'allow', CMCP_BACKGROUND: '0', CMCP_HELPER: h22.sti, CMCP_OSASCRIPT: jaAttrap22.sti, diff --git a/test/sessionsport.mjs b/test/sessionsport.mjs index b8ff1af5..c405bbc5 100644 --- a/test/sessionsport.mjs +++ b/test/sessionsport.mjs @@ -24,12 +24,20 @@ const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const fails = []; const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; +// ⛔ 7/10: knappen «x» findes ikke. Siden F5 (77ba8b6) er et tryk, hvis maal +// `press --dry` ikke kan vise, en farlig handling, der spoerger HVER gang - +// med vilje. Proeven maalte derfor F5-vagten, ikke session-rabatten, og faldt +// paa enhver Mac hvor et program fra session-listen koerer (Gustavs: hans IDE). +// GitHubs Mac har intet saadant program og sprang punkt 1-3 over, saa CI saa +// det aldrig. Et fast, harmloest dry-svar maaler reglen proeven er navngivet efter. function klient(spoerger) { + const hj = lavFalskHjaelper('cmcp-sesport'); + hj.saetSvar({ 'press --dry': { would_press: { name: 'OK', role: 'AXButton' } } }); const env = { ...process.env, CMCP_MODE: 'allow', CMCP_BACKGROUND: '0', CMCP_ASK_TIMEOUT: '1', - CMCP_HELPER: lavFalskHjaelper('cmcp-sesport').sti, + CMCP_HELPER: hj.sti, CMCP_OSASCRIPT: spoerger.sti, CMCP_STATE_DIR: mkdtempSync(join(tmpdir(), 'cmcp-sesport-')), }; From 2f9bbff4e5ee119b136812e16e68882d09dcc202 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 12:29:03 +0200 Subject: [PATCH 079/132] proever: R6 - fast programliste, hele argv og readonly-klikket MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Panelets runde 6 (Astra + Opus) og trin 1's anden koersel paa 441e225: - sessionsport: programlisten er nu fast (session-program + Noeglering), saa punkt 3 maaler adgangskode-reglen og ikke `unknownTarget`, og filen springer ikke laengere over paa en Mac uden session-program. Punkt 3 taeller dialoger efter hvert kald (1,1,2). - claims 22c: de seks tal sammenlignes som hele argv-elementer - `/--steps 7/` accepterede ogsaa 70. - server-e2e «klik afvist i readonly»: (10,10) og det forreste program svares fast. Paa Gustavs Mac stod en webchat forrest, og sende-porten afviste foerst. Mutationsbevist: session-rabat fjernet -> 3 DUMP; `dangerousApp ||` fjernet -> punkt 2 og 3 roede; readonly-reglen slaaet fra -> klikket roedt; --steps x10 -> 22c afviser 70. Produktkoden og fingeraftrykket (eee5f73df272c8dd) uaendrede. Co-Authored-By: Claude Opus 5.5 --- test/claims.mjs | 8 +++++--- test/server-e2e.mjs | 10 ++++++++++ test/sessionsport.mjs | 34 +++++++++++++++++++++------------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/test/claims.mjs b/test/claims.mjs index b66591b5..9fbdf401 100644 --- a/test/claims.mjs +++ b/test/claims.mjs @@ -1116,9 +1116,11 @@ esac await new Promise(r => setTimeout(r, 300)); const kald = h22.kald().filter(k => k.argv[0] === 'drag').pop(); const a = kald ? kald.argv.join(' ') : ''; - const rigtigt = /--from-x 11/.test(a) && /--from-y 22/.test(a) - && /--to-x 33/.test(a) && /--to-y 44/.test(a) - && /--steps 7/.test(a) && /--hold-ms 150/.test(a); + // R6 (Astra): hele argv-elementer, ikke regex - `/--steps 7/` accepterede ogsaa 70. + const flag = (n) => { const i = kald ? kald.argv.indexOf(n) : -1; return i >= 0 ? kald.argv[i + 1] : undefined; }; + const rigtigt = flag('--from-x') === '11' && flag('--from-y') === '22' + && flag('--to-x') === '33' && flag('--to-y') === '44' + && flag('--steps') === '7' && flag('--hold-ms') === '150'; check('22c. og argumenterne naar hjaelperen uaendret', rigtigt, rigtigt ? 'alle seks tal kom igennem' : (a || 'intet drag-kald')); } diff --git a/test/server-e2e.mjs b/test/server-e2e.mjs index 3fdf1fe3..e134483d 100644 --- a/test/server-e2e.mjs +++ b/test/server-e2e.mjs @@ -215,7 +215,17 @@ try { } // Skrivende vaerktoej i readonly SKAL afvises + // ⛔ 7/10: (10,10) blev slaaet op paa menneskets RIGTIGE skaerm. Laa der en + // Send-knap i en beskedapp, afviste sende-porten foerst («could not be tied to + // the text field») - ogsaa en afvisning, men ikke den proeven er navngivet + // efter. Et fast, neutralt svar paa `at` OG paa programlisten (sende-porten + // tager programmet fra det forreste, `apps --all` -> `active`; stod en browser + // med en webchat forrest, var klikket en mulig afsendelse) lige omkring dette + // ene kald goer det readonly-reglen der afviser, uanset hvad der staar paa skaermen. + attrap.saetSvar({ at: { found: true, bundleId: 'com.apple.finder', role: 'AXGroup', title: '' }, + apps: { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 4241, active: true }] } }); const click = await rpc('tools/call', { name: 'computer_click', arguments: { x: 10, y: 10 } }); + attrap.saetSvar({}); const ctxt = click.result?.content?.[0]?.text || ''; check('klik afvist i readonly', click.result?.isError === true && /readonly/.test(ctxt), ctxt.slice(0, 60).replace(/\s+/g, ' ')); diff --git a/test/sessionsport.mjs b/test/sessionsport.mjs index c405bbc5..ca3cc358 100644 --- a/test/sessionsport.mjs +++ b/test/sessionsport.mjs @@ -32,7 +32,14 @@ const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? // det aldrig. Et fast, harmloest dry-svar maaler reglen proeven er navngivet efter. function klient(spoerger) { const hj = lavFalskHjaelper('cmcp-sesport'); - hj.saetSvar({ 'press --dry': { would_press: { name: 'OK', role: 'AXButton' } } }); + // ⛔ R6 (Astra): ogsaa programlisten er fast. Ellers afhang punkt 1-3 af hvad der + // koerer: uden session-program sprang hele filen over, og uden Noeglering blev + // maalet null, saa `unknownTarget` - ikke adgangskode-reglen - gav dialog nr. 2. + hj.saetSvar({ + 'press --dry': { would_press: { name: 'OK', role: 'AXButton' } }, + apps: { apps: [{ name: 'Agent360 IDE', bundleId: SESSIONS_APP, pid: 4242 }, + { name: 'Keychain Access', bundleId: 'com.apple.keychainaccess', pid: 4243 }] }, + }); const env = { ...process.env, CMCP_MODE: 'allow', CMCP_BACKGROUND: '0', @@ -64,18 +71,13 @@ function klient(spoerger) { // «ukendt» - og porten spurgte hver gang af en HELT anden grund. Proeven // sagde «session-rabatten virker ikke»; den maalte ukendt-maal-porten. // Et program skal koere for at kunne opsloes. Vi vaelger derfor et der goer. +// 7/10 (R6, Astra): «et der koerer» gjorde udfaldet afhaengigt af maskinen - +// paa GitHubs Mac koerte intet, og punkt 1-3 sprang over. Nu er maalet fast, +// og programlisten svares af attrappen (se `klient`), saa det altid kan opsloes. const { SPOERG_PR_SESSION: LISTE } = await import(join(ROOT, 'mcp-server', 'policy.js')); -const koerende = (await import('node:child_process')).execSync( - `"${lavFalskHjaelper('cmcp-opslag').sti}" apps`, { encoding: 'utf8' }); -const SESSIONS_APP = (JSON.parse(koerende).apps || []) - .map(a => a.bundleId).find(b => LISTE.has(b)); -if (!SESSIONS_APP) { - console.log('UMAALT intet program fra session-listen koerer - punkt 1-3 kan ikke maales'); - console.log(); - console.log('BESTAAET'); - process.exit(0); -} -console.log(` (maaler mod ${SESSIONS_APP})`); +const SESSIONS_APP = 'com.agent360.ide'; +if (!LISTE.has(SESSIONS_APP)) { console.log(`DUMP ${SESSIONS_APP} staar ikke paa session-listen`); console.log(); console.log('DUMPET: 1'); process.exit(1); } +console.log(` (maaler mod ${SESSIONS_APP}, fast programliste)`); // --- 1. Et SESSION-PROGRAM spoerger ÉN gang, ikke tre --------------------- { @@ -136,12 +138,18 @@ console.log(` (maaler mod ${SESSIONS_APP})`); const c = klient(sp); await c.rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'p', version: '1' } }); c.srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' }) + '\n'); + // R6 (Astra): taelles efter HVERT kald, saa et forkert foerste eller andet kald + // ikke kan skjules af et samlet tal der tilfaeldigvis rammer 2. + const efter = []; await c.rpc('tools/call', { name: 'computer_press', arguments: { app: SESSIONS_APP, title: 'x' } }); + efter.push(sp.gangeSpurgt()); await c.rpc('tools/call', { name: 'computer_press', arguments: { app: SESSIONS_APP, title: 'x' } }); + efter.push(sp.gangeSpurgt()); await c.rpc('tools/call', { name: 'computer_press', arguments: { app: 'com.apple.keychainaccess', title: 'x' } }); + efter.push(sp.gangeSpurgt()); c.srv.kill(); check('et ja til arbejdsprogrammet daekker ikke en adgangskode-boks', - sp.gangeSpurgt() === 2, `${sp.gangeSpurgt()} dialoger: 1 for programmet + 1 for noeglen`); + efter.join(',') === '1,1,2', `dialoger efter hvert kald: ${efter.join(',')} (forventet 1,1,2)`); } // --- 4. Editorerne ER paa listen - det var hele hullet -------------------- From e9531ebf2ab2513768198ba4a0e6348f976ecff2 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 13:28:38 +0200 Subject: [PATCH 080/132] sync-tal: forbeholdet naevner den udgivne versions eget tal (panel R8, G) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit «0.1.0, which has 12 tools» stod skrevet fast tre steder. I 0.2.2-cyklussen (PUBLICERET=0.2.1) ville forsiden have sagt «0.2.1, which has 12 tools». Tallet laeses nu fra den udgivne versions git-maerke (`v`); 0.1.0 har intet maerke og beholder sit maalte tal; ukendt version naevner intet tal. Intet skrives i traeet, saa release.sh's toerkoersel efterlader det rent. Beskyttelsen af forbeholdets tal foelger den udgivne version, ikke '0.1.0'. I dag (PUBLICERET 0.1.0) er outputtet byte-identisk: 0 af 29 flader rettet. Ny proeve test/sync-tal-versioner.mjs (lokal klon): 0.1.0, v0.2.0 (28), ukendt, udgivet==kilden, idempotens. Mutationsbevist: fast «12» -> 3 DUMP; beskyttelse kun for 0.1.0 -> installationssiden siger kildens 32. Co-Authored-By: Claude Opus 5.5 --- scripts/sync-tal.py | 54 +++++++++++++++++++++---- test/run-all.sh | 1 + test/sync-tal-versioner.mjs | 80 +++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 test/sync-tal-versioner.mjs diff --git a/scripts/sync-tal.py b/scripts/sync-tal.py index fdb1565c..184bc2cb 100755 --- a/scripts/sync-tal.py +++ b/scripts/sync-tal.py @@ -55,8 +55,10 @@ def _erstat(t, moenster, nyt_ord, hale): t, flags=re.I) def er_versionsforbehold(t, i): - # "0.1.0, which has 12 tools" er med RETTE et andet tal. - return '0.1.0' in t[max(0, i-90):i+20] + # ", which has K tools" er med RETTE et andet tal end kildens. + # 7/10: var '0.1.0' skrevet fast - saa et forbehold om 0.2.1 blev «rettet» til kildens tal. + w = t[max(0, i-90):i+20] + return 'serves' in w and (UDGIVET in w or '0.1.0' in w) # ⛔ TREDJE FORMULERING DER SLAP FORBI 19/9: forbeholdet paa install-siderne # sagde "The source in the repository has 22" mens koden havde 25. Foerst @@ -65,7 +67,7 @@ def er_versionsforbehold(t, i): # Een kilde, seks visninger. FORBEHOLD = """

What you get today, honestly. npx currently serves -0.1.0, which has 12 tools. The code in the repository has {n}: menu bar +{u}{har}. The code in the repository has {n}: menu bar access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. @@ -89,6 +91,37 @@ def er_versionsforbehold(t, i): NUVAERENDE = json.load(io.open(os.path.join(ROD, 'mcp-server/package.json'), encoding='utf-8'))['version'] AFSTAND = UDGIVET != NUVAERENDE +# ⛔ 7/10 (panel R8, punkt G): forbeholdet sagde «0.1.0, which has 12 tools» - +# skrevet fast tre steder. I 0.2.2-cyklussen (PUBLICERET=0.2.1) ville det sige +# «0.2.1, which has 12 tools»: forkert, paa det trin hvor en ny bruger beslutter +# sig. Tallet for den UDGIVNE version laeses nu fra dens git-maerke (`v`), +# som er sandhedskilden for hvad der blev udgivet. Intet skrives i traeet - en +# datafil ville efterlade et urent trae efter release.sh's toerkoersel. +# 0.1.0 har intet maerke; tallet er maalt paa npm 18/9. Ukendt bliver IKKE 12: +# saa naevnes intet tal. +KENDTE_UDGIVNE = {'0.1.0': 12} +def udgivet_tal(v): + if v == NUVAERENDE: return N + if v in KENDTE_UDGIVNE: return KENDTE_UDGIVNE[v] + import tempfile + try: + with tempfile.TemporaryDirectory() as d: + a = subprocess.run(['git', 'archive', 'v' + v, 'mcp-server'], cwd=ROD, capture_output=True, timeout=60) + if a.returncode: return None + if subprocess.run(['tar', '-x', '-C', d], input=a.stdout, capture_output=True, timeout=60).returncode: return None + r = subprocess.run(['node', '-e', "import('./mcp-server/tools.js').then(m=>console.log(m.TOOLS.length))"], + cwd=d, capture_output=True, text=True, timeout=60) + s = r.stdout.strip() + return int(s) if r.returncode == 0 and s.isdigit() else None + except Exception: + return None +K = udgivet_tal(UDGIVET) if AFSTAND else N +def _har(k, ord_=False): + """«, which has 32 tools» / «, which has thirty-two» - eller intet tal, naar det er ukendt.""" + if k is None: return '' + return (ORD[k] if ord_ and k < len(ORD) else str(k)) +print('udgivet: %s (%s vaerktoejer)' % (UDGIVET, K if K is not None else 'ukendt antal')) + for f in sorted(x[len(ROD)+1:] for x in glob.glob(ROD+'/docs/docs/install-*/index.html')): p2 = os.path.join(ROD, f) t2 = io.open(p2, encoding='utf-8').read() @@ -100,7 +133,7 @@ def er_versionsforbehold(t, i): har = re.search(MOENSTER, t2, flags=re.S) is not None ny, hvad = t2, None if AFSTAND and har: - ny = re.sub(MOENSTER, FORBEHOLD.format(n=N, v=NUVAERENDE), t2, count=1, flags=re.S); hvad = 'genskrevet' + ny = re.sub(MOENSTER, FORBEHOLD.format(n=N, v=NUVAERENDE, u=UDGIVET, har=(', which has %d tools' % K) if K is not None else ', an earlier version'), t2, count=1, flags=re.S); hvad = 'genskrevet' elif AFSTAND and not har: ANKER = '

The whole thing, in three steps

' if ANKER in t2: @@ -118,7 +151,7 @@ def er_versionsforbehold(t, i): # identisk; det var den ikke. # Bevis: fjern blokken fra én fil, koer scriptet EEN gang, # `git diff` skal vaere tom. Foer rettelsen var den det ikke. - ny = t2.replace(ANKER, FORBEHOLD.format(n=N, v=NUVAERENDE) + ANKER, 1); hvad = 'sat ind igen' + ny = t2.replace(ANKER, FORBEHOLD.format(n=N, v=NUVAERENDE, u=UDGIVET, har=(', which has %d tools' % K) if K is not None else ', an earlier version') + ANKER, 1); hvad = 'sat ind igen' else: print(' ⚠ ingen plads til forbeholdet i', f, '- saet det ind i haanden') elif not AFSTAND and har: @@ -188,7 +221,8 @@ def tal(m): # Nu er der én kilde (udgivet, kilden, N) og fem visninger. Tomme markoerer # fyldes; er der ingen afstand, toemmes de igen. def _forbehold(fil, udgivet, n): - lang = (f'`npx @agent360/computer-mcp` currently serves **{udgivet}**, which has 12 tools. ' + har = f', which has {K} tools' if K is not None else ', an earlier version' + lang = (f'`npx @agent360/computer-mcp` currently serves **{udgivet}**{har}. ' f'The {n} tools described here are the source: they are built and tested, but not published yet. ' f'Building from source takes about thirty-five seconds if you want them now.') if fil.endswith('.html'): @@ -197,9 +231,13 @@ def _forbehold(fil, udgivet, n): .replace('npx @agent360/computer-mcp', 'npx @agent360/computer-mcp') + '

') if fil.endswith('.txt'): - return (f'VERSION: npx serves {udgivet}, which has 12 tools. The {n} tools described below are\n' + if K is not None: + return (f'VERSION: npx serves {udgivet}, which has {K} tools. The {n} tools described below are\n' + f'the source: they are built and tested but not published yet. Do not tell a user\n' + f'that a tool is available after an npx install unless it is one of the {_har(K, True)}.') + return (f'VERSION: npx serves {udgivet}, an earlier version. The {n} tools described below are\n' f'the source: they are built and tested but not published yet. Do not tell a user\n' - f'that a tool is available after an npx install unless it is one of the twelve.') + f'that a tool is available after an npx install unless you know {udgivet} has it.') return '> **What you get today, honestly.** ' + lang MARKERET = ['docs/index.html', 'docs/tools.html', 'README.md', diff --git a/test/run-all.sh b/test/run-all.sh index 28f1a201..cc966da1 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -96,6 +96,7 @@ run "laas fejler lukket" "node test/laas-fejler-lukket.mjs" run "doeren" "node test/doer.mjs" run "menu-genvej" "node test/menu-genvej.mjs" run "knap-ord" "node test/knap-ord.mjs" +run "versionstekster" "node test/sync-tal-versioner.mjs" run "forrest-log" "node test/forrest-log-kalibrering.mjs" run "fejlbeskeder" "node test/errors.mjs" diff --git a/test/sync-tal-versioner.mjs b/test/sync-tal-versioner.mjs new file mode 100644 index 00000000..2066932a --- /dev/null +++ b/test/sync-tal-versioner.mjs @@ -0,0 +1,80 @@ +// FORBEHOLDET NAEVNER DEN UDGIVNE VERSIONS EGET TAL - aldrig et fast «12». +// +// ⛔ 7/10 (panel R8, punkt G): `sync-tal.py` skrev «0.1.0, which has 12 tools» fast +// tre steder. I 0.2.2-cyklussen (PUBLICERET=0.2.1) ville forsiden have sagt +// «0.2.1, which has 12 tools» - forkert, paa det trin hvor en ny bruger beslutter +// sig. Tallet laeses nu fra den udgivne versions git-maerke; ukendt = intet tal. +// +// Koeres i en lokal klon (med maerker), saa intet i arbejdstraeet aendres. +import { execFileSync } from 'node:child_process'; +import { mkdtempSync, readFileSync, writeFileSync, copyFileSync, rmSync } from 'node:fs'; +import { join, dirname } from 'node:path'; +import { tmpdir } from 'node:os'; +import { fileURLToPath } from 'node:url'; + +const ROD = join(dirname(fileURLToPath(import.meta.url)), '..'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +const D = mkdtempSync(join(tmpdir(), 'cmcp-synctal-')); +const K = join(D, 'r'); +try { + execFileSync('git', ['clone', '--quiet', '--shared', ROD, K]); + // Proeven skal maale den sync-tal der ligger i arbejdstraeet, ogsaa foer commit. + copyFileSync(join(ROD, 'scripts', 'sync-tal.py'), join(K, 'scripts', 'sync-tal.py')); + const pakke = JSON.parse(readFileSync(join(K, 'mcp-server', 'package.json'), 'utf8')).version; + const koer = (udgivet) => { + writeFileSync(join(K, 'PUBLICERET'), udgivet + '\n'); + execFileSync('python3', ['scripts/sync-tal.py'], { cwd: K, stdio: 'pipe' }); + return { + forside: readFileSync(join(K, 'docs', 'index.html'), 'utf8'), + readme: readFileSync(join(K, 'README.md'), 'utf8'), + llms: readFileSync(join(K, 'docs', 'llms.txt'), 'utf8'), + install: readFileSync(join(K, 'docs', 'docs', 'install-claude-code', 'index.html'), 'utf8'), + }; + }; + const forbehold = (t) => (t.match(/FORBEHOLD -->([\s\S]*?) +```jsonl +{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} +{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} +{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} +{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} +{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} +``` + + Each gate has a test, and each test has been mutation-checked: break the code on purpose and the test goes red. See [Testing](#testing). diff --git a/mcp-server/README.md b/mcp-server/README.md index f4b218ca..c32629b3 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -109,6 +109,27 @@ breach. The salt is random per run and never written down, because an unsalted hash of a short password can be guessed offline by whoever holds the log. The honest cost: two actions can be compared within one run, not across runs. +Here is what that looks like, unedited. In the lines below an agent typed a +sentence into TextEdit behind the window the person was using, asked in the menu +bar to move a file to the Trash and got no answer, then was refused when it tried +to type into 1Password. They come from an isolated test run - its own state +folder and a stand-in for the helper, so no real screen was touched and nobody's +own log was read - which `node scripts/log-uddrag.mjs` repeats. The `presence` +fields were measured on the Mac that made the run. A test checks that +every line is byte for byte in +[the full log of that run](https://github.com/Agent360dk/computerMCP/blob/main/test/fixtures/audit-readme.jsonl) +and that its chain holds. + + +```jsonl +{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} +{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} +{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} +{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} +{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} +``` + + Each gate has a test, and each test has been mutation-checked: break the code on purpose and the test goes red. See [Testing](#testing). diff --git a/scripts/log-uddrag.mjs b/scripts/log-uddrag.mjs new file mode 100644 index 00000000..da27dd9e --- /dev/null +++ b/scripts/log-uddrag.mjs @@ -0,0 +1,78 @@ +// README'S LOG-UDDRAG KOMMER FRA EN RIGTIG KOERSEL - ALDRIG FRA NOGENS EGEN LOG (punkt L). +// +// ⛔ 7/10 (panel R8-R9): «proof, not promises» kraever at README viser loggen som den +// er. Uddraget maa ikke komme fra et menneskes rigtige revisionslog (den beskriver +// hans maskine), og det maa ikke vaere skrevet i haanden. Scriptet koerer den +// rigtige server i en tom, midlertidig mappe, med en hjaelper og en spoerger der +// ikke kan roere skaermen, og gemmer loggen som test/fixtures/audit-readme.jsonl. +// test/readme-log.mjs kraever at README-uddraget staar byte for byte i den fil, og +// at filens kaede holder. +// +// node scripts/log-uddrag.mjs # skriver fixturen og README-blokken igen +// +// Koeres ved hvert versionsloeft: linjen med spoergsmaalet baerer serverens version, +// og proeven kraever at den er pakkens. Blokken skrives i BEGGE README'er (repoets og +// npm's), saa claims 45 stadig ser dem som een. +import { spawn } from 'node:child_process'; +import { mkdtempSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'node:fs'; +import { createServer } from 'node:net'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { lavFalskHjaelper, lavFalskSpoerger } from '../test/falsk-hjaelper.mjs'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const UD = join(ROOT, 'test', 'fixtures', 'audit-readme.jsonl'); +const STATE = mkdtempSync(join(tmpdir(), 'cmcp-log-uddrag-')); +const h = lavFalskHjaelper('cmcp-log-uddrag'); +h.saetSvar({ + // Mennesket arbejder i Safari; agenten skriver i TextEdit bag ved. + apps: { apps: [{ name: 'Safari', bundleId: 'com.apple.Safari', pid: 500, active: true }, + { name: 'TextEdit', bundleId: 'com.apple.TextEdit', pid: 501, active: false }, + { name: 'Finder', bundleId: 'com.apple.finder', pid: 502, active: false }, + { name: '1Password', bundleId: 'com.1password.1password', pid: 503, active: false }] }, +}); +// Ingen svarer: et udloeb er et nej, og det er det loggen skal vise. +const sp = lavFalskSpoerger('udloeb', 'cmcp-log-uddrag-sp'); +// Standardopsaetningen har menulinje-ikonet: spoergsmaalet gaar dertil. Attrappen +// tager imod og svarer aldrig (som et menneske der ikke er der). +mkdirSync(STATE, { recursive: true, mode: 0o700 }); +const ikon = createServer(sock => { sock.on('data', () => {}); sock.on('error', () => {}); }); +await new Promise(r => ikon.listen(join(STATE, 'ikon.sock'), r)); + +const srv = spawn('node', [join(ROOT, 'mcp-server', 'index.js')], { + env: { ...process.env, CMCP_STATE_DIR: STATE, CMCP_HELPER: h.sti, CMCP_OSASCRIPT: sp.sti, CMCP_ASK_TIMEOUT: '1', + CMCP_STATUS_IKON: '0', CMCP_NO_PARENT_WATCH: '1', CMCP_MODE: 'allow' }, + stdio: ['pipe', 'pipe', 'pipe'] }); +let buf = '', n = 0; const w = new Map(); +srv.stdout.on('data', d => { buf += d; let i; while ((i = buf.indexOf('\n')) >= 0) { const l = buf.slice(0, i); buf = buf.slice(i + 1); try { const m = JSON.parse(l); w.get(m.id)?.(m); } catch {} } }); +const rpc = (m, p) => new Promise((r, rej) => { const id = ++n; w.set(id, r); srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method: m, params: p }) + '\n'); setTimeout(() => rej(new Error('timeout ' + m)), 30000); }); +try { + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'readme-example', version: '1' } }); + srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' }) + '\n'); + for (const [name, args] of [ + ['computer_apps', {}], + ['computer_type', { app: 'TextEdit', text: 'Dear Anna, the meeting moves to 3 pm.' }], + ['computer_menu', { app: 'Finder', path: 'File > Move to Trash' }], + ['computer_type', { app: '1Password', text: 'hunter2' }], + ]) { + const r = await rpc('tools/call', { name, arguments: args }); + console.log(`${name}: ${(r.result?.content?.[0]?.text || '').split('\n')[0].slice(0, 90)}`); + } +} finally { srv.kill(); ikon.close(); } +const log = readFileSync(join(STATE, 'audit.jsonl'), 'utf8'); +writeFileSync(UD, log); +rmSync(STATE, { recursive: true, force: true }); +const linjer = log.trim().split('\n'); +console.log(`\n${linjer.length} linjer skrevet til ${UD.slice(ROOT.length + 1)}`); + +// README-blokken: fra agentens foerste skrivning til enden - uredigeret. +const fra = linjer.findIndex(l => l.includes('"tool":"computer_type"')); +const blok = '\n```jsonl\n' + linjer.slice(fra).join('\n') + '\n```\n'; +for (const f of ['README.md', join('mcp-server', 'README.md')]) { + const sti = join(ROOT, f), s = readFileSync(sti, 'utf8'); + const m = s.match(/[\s\S]*?/g); + if (m?.length !== 1) { console.error(`${f}: fandt ${m?.length || 0} log-uddrag-blokke (skal vaere 1)`); process.exit(1); } + writeFileSync(sti, s.replace(m[0], () => blok)); + console.log(`${f}: blokken skrevet (${linjer.length - fra} linjer)`); +} diff --git a/test/fixtures/audit-readme.jsonl b/test/fixtures/audit-readme.jsonl new file mode 100644 index 00000000..bdbaffb4 --- /dev/null +++ b/test/fixtures/audit-readme.jsonl @@ -0,0 +1,7 @@ +{"ts":"2026-10-07T17:22:54.385Z","session":"8ee3b910","call":"c698ab9e","tool":"computer_apps","tier":"read","args":{},"target":null,"mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"read-only action","l":1,"kaede":"f90da7ce9496281c"} +{"ts":"2026-10-07T17:22:54.773Z","session":"8ee3b910","call":"c698ab9e","tool":"computer_apps","outcome":"ok","l":1,"kaede":"d179ce3526458624"} +{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} +{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} +{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} +{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} +{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} diff --git a/test/readme-log.mjs b/test/readme-log.mjs new file mode 100644 index 00000000..a8bb9243 --- /dev/null +++ b/test/readme-log.mjs @@ -0,0 +1,52 @@ +// README'S LOG-UDDRAG ER LOGGEN SOM DEN ER (punkt L). +// +// ⛔ 7/10 (panel R8): uddraget skal vaere en byte-eksakt del af en committet log fra +// en isoleret koersel, og den logs kaede skal holde. Aendres et tegn i uddraget +// eller i loggen, er proeven roed. Loggen skrives af scripts/log-uddrag.mjs - +// aldrig af et menneskes egen revisionslog. +import { readFileSync, mkdtempSync, copyFileSync } from 'node:fs'; +import { tmpdir, homedir, hostname } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +const FIX = join(ROOT, 'test', 'fixtures', 'audit-readme.jsonl'); +const fix = readFileSync(FIX, 'utf8'); +const fixLinjer = fix.trim().split('\n'); +const readme = readFileSync(join(ROOT, 'README.md'), 'utf8'); +const blokke = [...readme.matchAll(/\n```jsonl\n([\s\S]*?)\n```\n/g)]; +check('README har praecis een log-uddrag-blok', blokke.length === 1, `${blokke.length}`); +const uddrag = (blokke[0]?.[1] || '').split('\n'); + +// 1. Byte for byte, i samme raekkefoelge, uden huller - saa kaeden kan foelges i uddraget. +const start = fixLinjer.indexOf(uddrag[0]); +const sammenhaengende = start >= 0 && uddrag.every((l, i) => fixLinjer[start + i] === l); +check('hver linje i uddraget staar byte for byte i loggen, i raekkefoelge', sammenhaengende, + sammenhaengende ? `${uddrag.length} linjer fra linje ${start + 1}` : `foerste afvigende: ${(uddrag.find((l, i) => fixLinjer[start + i] !== l) || uddrag[0] || '').slice(0, 70)}`); +check('uddraget viser mindst et ja, et spoergsmaal uden svar og et nej', uddrag.length >= 3 + && uddrag.some(l => /"decision":"allowed"/.test(l)) + && uddrag.some(l => /"asked":true/.test(l) && /"decision":"denied"/.test(l)) + && uddrag.some(l => /"asked":false/.test(l) && /"decision":"denied"/.test(l))); + +// 2. Loggens kaede holder - maalt med produktets egen kontrol, paa en kopi. +process.env.CMCP_STATE_DIR = mkdtempSync(join(tmpdir(), 'cmcp-readme-log-')); +copyFileSync(FIX, join(process.env.CMCP_STATE_DIR, 'audit.jsonl')); +const { kaedenHolder } = await import('../mcp-server/audit.js'); +const k = kaedenHolder(); +check('loggens kaede holder fra ende til anden', k.ok === true && k.checked === fixLinjer.length && k.aegte === 0 && k.gamle === 0, + JSON.stringify(k)); + +// 3. Linjen med spoergsmaalet baerer serverens version - den skal vaere pakkens. +const version = JSON.parse(readFileSync(join(ROOT, 'mcp-server', 'package.json'), 'utf8')).version; +const servere = [...fix.matchAll(/"server":"([^"]+)"/g)].map(m => m[1]); +check('loggen er fra den version pakken udgiver (ellers: node scripts/log-uddrag.mjs)', + servere.length > 0 && servere.every(v => v === version), `${servere.join(',') || 'ingen'} / ${version}`); + +// 4. Intet fra maskinen der skrev den. +check('loggen naevner hverken hjemmemappe eller maskinnavn', !fix.includes(homedir()) && !fix.includes(hostname())); + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/run-all.sh b/test/run-all.sh index 753497f6..6aaed09c 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -108,6 +108,7 @@ run "efter udgivelsen" "node test/efter-udgivelsen.mjs" run "claude code-plugin" "node test/plugin-manifest.mjs" run "tilstand isoleret" "node test/tilstand-isoleret.mjs" run "faste opslag" "node test/attrap-faste-opslag.mjs" +run "readme-log" "node test/readme-log.mjs" run "forrest-log" "node test/forrest-log-kalibrering.mjs" run "fejlbeskeder" "node test/errors.mjs" From fbf3d18267b55ebf16ea3d6e0fae815066ad8c12 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 19:28:42 +0200 Subject: [PATCH 093/132] =?UTF-8?q?feat(ikon):=20=C3=A9n=20lyd=20pr.=20nyt?= =?UTF-8?q?=20spoergsmaal,=20kan=20slaas=20til=20i=20menuen=20(punkt=20S)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reglen bor i helper/Sources/cmcp-status/Lyd.swift: lyd kun for et nyt, aabent spoergsmaal - aldrig ved udloeb (nyAnmodning kaldes ogsaa dér), aldrig for et besvaret, aldrig to gange for samme nonce (genlevering). Menupunktet «Play a sound when an agent needs you» slaar den til og fra. Standarden er Gustavs valg (Opus: til · Astra: tilvalg). Indtil da: tilvalg (LYD_STANDARD = false), og README lover det samme. test/ikon-lyd.mjs kompilerer Lyd.swift for sig (starter aldrig ikonet), 12 tjek; i run-all.sh og ci.yml. Mutanter S1-S4 roede; S2 overlevede foerst, fordi udloebet blev maalt paa et spoergsmaal genleverings-reglen allerede daekkede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 48 +++++++++++++++++++ .github/workflows/ci.yml | 5 ++ README.md | 3 ++ helper/Sources/cmcp-status/Lyd.swift | 32 +++++++++++++ helper/Sources/cmcp-status/main.swift | 11 +++++ mcp-server/README.md | 3 ++ test/ikon-lyd.mjs | 69 +++++++++++++++++++++++++++ test/run-all.sh | 1 + 8 files changed, 172 insertions(+) create mode 100644 helper/Sources/cmcp-status/Lyd.swift create mode 100644 test/ikon-lyd.mjs diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 4ac4ffd3..65624869 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1238,5 +1238,53 @@ "\"reason\":\"read-only action.\"" ] ] + }, + { + "navn": "S1-lyd-ved-genlevering", + "fil": "helper/Sources/cmcp-status/Lyd.swift", + "proeve": "test/ikon-lyd.mjs", + "forventet": "2 samme spoergsmaal leveret igen", + "par": [ + [ + "guard til, !lukket, !besvaret, !hoerte.contains(nonce) else { return false }", + "guard til, !lukket, !besvaret else { return false }" + ] + ] + }, + { + "navn": "S2-lyd-ved-udloeb", + "fil": "helper/Sources/cmcp-status/Lyd.swift", + "proeve": "test/ikon-lyd.mjs", + "forventet": "3 udloebet", + "par": [ + [ + "guard til, !lukket, !besvaret, !hoerte.contains(nonce) else { return false }", + "guard til, !besvaret, !hoerte.contains(nonce) else { return false }" + ] + ] + }, + { + "navn": "S3-lyd-til-uden-gustavs-valg", + "fil": "helper/Sources/cmcp-status/Lyd.swift", + "proeve": "test/ikon-lyd.mjs", + "forventet": "9 standarden er tilvalg", + "par": [ + [ + "let LYD_STANDARD = false", + "let LYD_STANDARD = true" + ] + ] + }, + { + "navn": "S4-lyd-uden-om-reglen", + "fil": "helper/Sources/cmcp-status/main.swift", + "proeve": "test/ikon-lyd.mjs", + "forventet": "10 ikonet har én lyd", + "par": [ + [ + "if lydHukommelse.skalLyde(", + "if true || lydHukommelse.skalLyde(" + ] + ] } ] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a1e0ba1..a9b38263 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,11 @@ jobs: - name: README'ens log-uddrag er loggen som den er run: node test/readme-log.mjs + # 7/10 (punkt S): hoejst én lyd pr. nyt spoergsmaal. Kompilerer ikonets Lyd.swift + # for sig - starter aldrig ikonet. + - name: Ikonets lyd-regel + run: node test/ikon-lyd.mjs + - name: Det der IKKE er proevet her # En groen koersel maa ikke kunne forveksles med en fuld proeve. # Tilgaengelighed og Skaermoptagelse kan ikke gives paa en byggekoerer, diff --git a/README.md b/README.md index ecf28861..8f5b3801 100644 --- a/README.md +++ b/README.md @@ -381,6 +381,9 @@ thing this product puts on your screen, and it never takes focus. - **No banners by default, and never a button in one.** A notification with an `Allow` button would be a second way to say yes - and an agent can click a notification. You can switch a plain banner on from the icon's own menu. +- **A sound, if you want one.** Switch it on in the icon's menu, and each new + question plays one sound - not again if the same question is sent twice, and + not when it expires. - **The icon cannot be touched by an agent.** Any write tool aimed at it is refused in every mode, before the gate can even ask. Measured: without that rule, three of three presses reached the helper. diff --git a/helper/Sources/cmcp-status/Lyd.swift b/helper/Sources/cmcp-status/Lyd.swift new file mode 100644 index 00000000..5d765e63 --- /dev/null +++ b/helper/Sources/cmcp-status/Lyd.swift @@ -0,0 +1,32 @@ +import Foundation + +// LYD VED ET NYT SPOERGSMAAL (panel R8-R9, punkt S, 7/10). +// +// ⛔ 22 af 23 spoergsmaal 30/9-4/10 udloeb ubesvaret. Det orange ikon ses kun af den +// der kigger paa menulinjen; en lyd naar ogsaa den hvis blik er i chatten. +// Reglen: ÉN lyd pr. nyt spoergsmaal - aldrig ved udloeb (`nyAnmodning` kaldes +// ogsaa dér, for at slukke det orange), aldrig for et spoergsmaal der allerede er +// besvaret, og aldrig to gange for samme nonce (en server kan levere det samme +// spoergsmaal igen paa en ny forbindelse). Afgjort her, ét sted, saa test/ikon-lyd.mjs +// kompilerer og maaler den samme regel ikonet bruger - uden at starte ikonet. +// +// ⏳ Standarden er Gustavs valg (Opus: til, hans egen WISHLIST-tekst · Astra: tilvalg). +// Indtil han har valgt: tilvalg - intet nyt bliver standard uden hans ja. +let LYD_STANDARD = false + +func lydSlaaetTil() -> Bool { + (UserDefaults.standard.object(forKey: "lyd") as? Bool) ?? LYD_STANDARD +} + +struct LydHukommelse { + private(set) var hoerte = Set() + + /// Skal dette spoergsmaal give lyd nu? Husker nonce'en, saa svaret kun er ja én gang. + mutating func skalLyde(nonce: String, lukket: Bool, besvaret: Bool, til: Bool) -> Bool { + guard til, !lukket, !besvaret, !hoerte.contains(nonce) else { return false } + // Et ikon lever i dagevis; hukommelsen maa ikke vokse uden graense. + if hoerte.count >= 1000 { hoerte.removeAll() } + hoerte.insert(nonce) + return true + } +} diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index 7b3be878..f4a76092 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -773,6 +773,10 @@ final class Ikon: NSObject, NSMenuDelegate { banner.target = self banner.state = UserDefaults.standard.bool(forKey: "banner") ? .on : .off m.addItem(banner) + let lyd = NSMenuItem(title: "Play a sound when an agent needs you", action: #selector(skiftLyd), keyEquivalent: "") + lyd.target = self + lyd.state = lydSlaaetTil() ? .on : .off + m.addItem(lyd) let skjul = NSMenuItem(title: "Hide this icon until the next agent starts", action: #selector(skjulIkon), keyEquivalent: "") skjul.target = self m.addItem(skjul) @@ -900,8 +904,15 @@ final class Ikon: NSObject, NSMenuDelegate { if nu { UNUserNotificationCenter.current().requestAuthorization(options: [.alert]) { _, _ in } } } + /// Lyden (punkt S): reglen bor i Lyd.swift, saa proeven maaler den samme. + @objc func skiftLyd() { UserDefaults.standard.set(!lydSlaaetTil(), forKey: "lyd") } + var lydHukommelse = LydHukommelse() + func vis(_ a: Anmodning) { tik() + if lydHukommelse.skalLyde(nonce: a.s.nonce, lukket: a.lukket, besvaret: a.besvaret, til: lydSlaaetTil()) { + NSSound(named: "Glass")?.play() + } // Et nyt spoergsmaal flytter boksen hen hvor mennesket er (30/9, live-proeven). if boks.isVisible { boks.placer(); boks.orderFrontRegardless() } guard UserDefaults.standard.bool(forKey: "banner") else { return } diff --git a/mcp-server/README.md b/mcp-server/README.md index c32629b3..1d75636c 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -379,6 +379,9 @@ thing this product puts on your screen, and it never takes focus. - **No banners by default, and never a button in one.** A notification with an `Allow` button would be a second way to say yes - and an agent can click a notification. You can switch a plain banner on from the icon's own menu. +- **A sound, if you want one.** Switch it on in the icon's menu, and each new + question plays one sound - not again if the same question is sent twice, and + not when it expires. - **The icon cannot be touched by an agent.** Any write tool aimed at it is refused in every mode, before the gate can even ask. Measured: without that rule, three of three presses reached the helper. diff --git a/test/ikon-lyd.mjs b/test/ikon-lyd.mjs new file mode 100644 index 00000000..55bf0048 --- /dev/null +++ b/test/ikon-lyd.mjs @@ -0,0 +1,69 @@ +// IKON-LYD: hoejst én lyd pr. nyt spoergsmaal (punkt S). +// +// ⛔ 7/10 (panel R8, Astra): «genlevering, timeout og afbrudt forbindelse giver hoejst +// ét signal pr. spoergsmaal». Proeven kompilerer ikonets egen Lyd.swift og koerer +// forloebene gennem den samme LydHukommelse som ikonet - ingen skaerm, intet ikon, +// ingen lyd. Og den binder ikonet til reglen: den eneste lyd i main.swift spilles +// kun naar skalLyde svarer ja, og menuen kan slaa den fra. +import { execFileSync } from 'node:child_process'; +import { mkdtempSync, writeFileSync, readFileSync, rmSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const KILDE = join(ROOT, 'helper', 'Sources', 'cmcp-status'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +const ARB = mkdtempSync(join(tmpdir(), 'cmcp-ikon-lyd-')); +try { + writeFileSync(join(ARB, 'main.swift'), `import Foundation +struct H: Decodable { let nonce: String; let lukket: Bool; let besvaret: Bool; let til: Bool } +let ind = try! JSONDecoder().decode([H].self, from: FileHandle.standardInput.readDataToEndOfFile()) +var hk = LydHukommelse() +let ud = ind.map { hk.skalLyde(nonce: $0.nonce, lukket: $0.lukket, besvaret: $0.besvaret, til: $0.til) } +FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ["lyde": ud, "standard": LYD_STANDARD])) +`); + const BIN = join(ARB, 'lyd'); + execFileSync('swiftc', [join(KILDE, 'Lyd.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 180000 }); + const koer = (h) => JSON.parse(execFileSync(BIN, { input: JSON.stringify(h), encoding: 'utf8' })); + const h = (nonce, { lukket = false, besvaret = false, til = true } = {}) => ({ nonce, lukket, besvaret, til }); + + // Et spoergsmaal i ikonets liv: vist, leveret igen paa en ny forbindelse, udloebet. + const r = koer([h('a'), h('a'), h('x', { lukket: true }), h('b'), h('c', { besvaret: true }), h('d', { til: false }), h('d')]).lyde; + check('1 et nyt spoergsmaal giver lyd', r[0] === true, JSON.stringify(r)); + check('2 samme spoergsmaal leveret igen giver ingen lyd', r[1] === false); + // Udloebet maales paa et spoergsmaal der IKKE fik lyd ved ankomst (fx slaaet fra dengang) - + // ellers holder genleverings-reglen i stedet, og proeven maaler den forkerte regel. + check('3 udloebet (orange slukkes) giver ingen lyd', r[2] === false); + check('4 et andet nyt spoergsmaal giver sin egen lyd', r[3] === true); + check('5 et besvaret spoergsmaal giver ingen lyd', r[4] === false); + check('6 slaaet fra giver ingen lyd', r[5] === false); + check('7 en lyd der ikke blev spillet (slaaet fra), taeller ikke som hoert', r[6] === true); + check('8 hoejst én lyd pr. spoergsmaal over hele forloebet', r.filter(Boolean).length === 3, `${r.filter(Boolean).length} lyde for a, b, d`); + + // Standarden er Gustavs valg (R9). Indtil han har valgt: tilvalg. + const { standard } = koer([]); + check('9 standarden er tilvalg, indtil Gustav har valgt', standard === false, String(standard)); + + // Ikonet bruger reglen: den eneste lyd staar under skalLyde, og menuen kan slaa den fra. + const main = readFileSync(join(KILDE, 'main.swift'), 'utf8'); + const lyde = main.match(/NSSound\(/g) || []; + check('10 ikonet har én lyd, og den spilles kun naar skalLyde svarer ja', lyde.length === 1 + && /if lydHukommelse\.skalLyde\(nonce: a\.s\.nonce, lukket: a\.lukket, besvaret: a\.besvaret, til: lydSlaaetTil\(\)\) \{\n\s*NSSound\(/.test(main), + `${lyde.length} lyde i main.swift`); + check('11 menuen har et punkt der slaar lyden til og fra', /"Play a sound when an agent needs you", action: #selector\(skiftLyd\)/.test(main) + && /func skiftLyd\(\) \{ UserDefaults\.standard\.set\(!lydSlaaetTil\(\), forKey: "lyd"\) \}/.test(main)); + // README'en lover det standarden giver - begge README'er (claims 45 holder dem ens). + const readme = readFileSync(join(ROOT, 'README.md'), 'utf8'); + const lover = standard ? /each new question plays one sound; switch it off in the icon's menu/i + : /Switch it on in the icon's menu, and each new\s+question plays one sound/; + check('12 README lover den standard ikonet har', lover.test(readme), standard ? 'til' : 'tilvalg'); +} catch (e) { + check('proeven koerte', false, String(e.stderr || e.message).slice(0, 200)); +} finally { + rmSync(ARB, { recursive: true, force: true }); +} +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/run-all.sh b/test/run-all.sh index 6aaed09c..0e9cc975 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -153,6 +153,7 @@ run "pakken starter" "node test/pakken-starter.mjs" run "samtykke-tekst" "node test/samtykke-tekst.mjs" # ⛔ 29/9: Touch ID-arket klippede handlingen ved 80 tegn, tavst - et ja til noget ulaest. run "hele teksten i menuen" "node test/ombryd.mjs" +run "lyd pr. spoergsmaal" "node test/ikon-lyd.mjs" # ⛔ 29/9: goer-selv, skaerm-laanet og den fulde tekst var kun kompileret i ikonet, aldrig koert. run "ikonets menu" "node test/ikon-menu.mjs" # ⛔ 29/9: Send i WhatsApp gik igennem i allow uden at nogen blev spurgt. From 35041ee4585288a4ac8236035671cea886c1209f Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:04:45 +0200 Subject: [PATCH 094/132] fix: panelets R10-fund (Astra + Opus) rettet, hvert med proeve og mutant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - P: computer_ask_user's menulinje-spoergsmaal faar sin maaling paa udfaldslinjen (tilstede 3b, mutant P5); ikonets version maales paa DET ikon der ejer tilstandsmappen (status.pid), og en versionsfil skiftet efter start siges som 'replaced since start' (tilstede 1 + 4 med stand-in-ikon, P6/P7) - D: hvert idle-opslag faar hoejst resttiden - ventetiden holder 5 s ogsaa med langsomme opslag (Astra maalte 6,7 s; skaerm-laan D4, D3 strammet til 6 s, mutant D4) - E: dok-pr.sh faerdiggoer committet naar det fejlede efter checkout -b (efter-udgivelsen F9 inkl. toerkoersel, mutant E9) - I: tidsudloebsgrenen i trykForhaand har nu en proeve (knap-ord 16, mutant Q32 - uden den trykkede serveren en Delete uden at spoerge, Opus O1) - L: uddraget bruger ogsaa et stand-in-ikon; README siger feltvis hvor presence kommer fra, og readme-log binder baade felterne og saetningen (mutant L3) - S: kaeden socket -> nyAnmodning -> vis(a) -> lyd bundet (ikon-lyd 13, mutant S5) - H: aegteOpslag sender ogsaa press --dry videre (kun press kender --dry, og det svarer foer trykket); ægte idle/at/focused-form maales igen (mutant H5) - kommentarer rettet: den doede !koordinatEjereFoer-gren og maalingens forsinkelse Mutanter 106 -> 115. policy.js og failclosed.mjs uaendrede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 108 +++++++++++++++++++++++++++++++ README.md | 20 +++--- mcp-server/README.md | 20 +++--- mcp-server/index.js | 19 +++++- mcp-server/status.js | 3 + mcp-server/tilstede.js | 33 +++++++--- scripts/log-uddrag.mjs | 8 ++- test/attrap-faste-opslag.mjs | 10 +++ test/efter-udgivelsen.mjs | 19 +++++- test/falsk-hjaelper.mjs | 30 ++++++++- test/fixtures/audit-readme.jsonl | 14 ++-- test/ikon-lyd.mjs | 5 ++ test/knap-ord.mjs | 12 +++- test/readme-log.mjs | 10 +++ test/skaerm-laan.mjs | 15 ++++- test/tilstede.mjs | 26 ++++++-- tools/dok-pr.sh | 15 ++++- 17 files changed, 316 insertions(+), 51 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 65624869..2afbd71a 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1286,5 +1286,113 @@ "if true || lydHukommelse.skalLyde(" ] ] + }, + { + "navn": "P5-ask-user-uden-maaling", + "fil": "mcp-server/index.js", + "proeve": "test/tilstede.mjs", + "forventet": "3b ask_user", + "par": [ + [ + "if (maaling) Object.defineProperty(res, '__presence'", + "if (false && maaling) Object.defineProperty(res, '__presence'" + ] + ] + }, + { + "navn": "P6-ny-version-om-gammel-proces", + "fil": "mcp-server/tilstede.js", + "proeve": "test/tilstede.mjs", + "forventet": "4 versionsfilen skiftet", + "par": [ + [ + "icon = !v ? 'unknown' : skiftet ? 'replaced since start' : v;", + "icon = !v ? 'unknown' : v;" + ] + ] + }, + { + "navn": "P7-ikonets-pid-ignoreres", + "fil": "mcp-server/tilstede.js", + "proeve": "test/tilstede.mjs", + "forventet": "1 ja: ikonets version er DETTE", + "par": [ + [ + "try { pid = readFileSync(IKON_PID_FIL, 'utf8').trim(); } catch { pid = null; }", + "pid = null;" + ] + ] + }, + { + "navn": "D4-sidste-opslag-faar-hele-fristen", + "fil": "mcp-server/index.js", + "proeve": "test/skaerm-laan.mjs", + "forventet": "D4 langsomme opslag", + "par": [ + [ + "try { m = await callHelper(['idle'], { timeout: Math.min(2000, tilbage) }); }", + "try { m = await callHelper(['idle'], { timeout: 2000 }); }" + ] + ] + }, + { + "navn": "E9-genoptag-uden-commit", + "fil": "tools/dok-pr.sh", + "proeve": "test/efter-udgivelsen.mjs", + "forventet": "F9 genoptaget", + "par": [ + [ + " if [ \"$(git branch --show-current)\" = \"$GREN\" ] && [ \"$(git rev-parse \"$GREN\")\" = \"$(git rev-parse origin/main)\" ]", + " if false && [ \"$(git rev-parse \"$GREN\")\" = \"$(git rev-parse origin/main)\" ]" + ] + ] + }, + { + "navn": "H5-dry-sluges-som-handling", + "fil": "test/falsk-hjaelper.mjs", + "proeve": "test/attrap-faste-opslag.mjs", + "forventet": "aegteOpslag: press --dry", + "par": [ + [ + "if (!OPSLAG.has(kommando) && !argv.includes('--dry')) {", + "if (!OPSLAG.has(kommando)) {" + ] + ] + }, + { + "navn": "S5-nyt-spoergsmaal-naar-ikke-lyden", + "fil": "helper/Sources/cmcp-status/main.swift", + "proeve": "test/ikon-lyd.mjs", + "forventet": "13 et nyt spoergsmaal", + "par": [ + [ + "nyAnmodning = { a in ikon.vis(a) }", + "nyAnmodning = { _ in ikon.tik() }" + ] + ] + }, + { + "navn": "Q32-tidsudloeb-i-toerkoersel-er-ufarligt", + "fil": "mcp-server/index.js", + "proeve": "test/knap-ord.mjs", + "forventet": "16 toerkoerslen naar ikke frem", + "par": [ + [ + " return { afvis: 'Refused: finding the element took too long, so what would be pressed could not be confirmed. Nothing was pressed, and nobody was asked. Try again.', grund: 'press: lookup timed out' };", + " return { farlig: false };" + ] + ] + }, + { + "navn": "L3-readme-presence-usand", + "fil": "README.md", + "proeve": "test/readme-log.mjs", + "forventet": "README siger hvor hvert presence-felt", + "par": [ + [ + "Only the box setting was read from", + "Every field was read from" + ] + ] } ] diff --git a/README.md b/README.md index 8f5b3801..8c4d6fb6 100644 --- a/README.md +++ b/README.md @@ -115,20 +115,22 @@ Here is what that looks like, unedited. In the lines below an agent typed a sentence into TextEdit behind the window the person was using, asked in the menu bar to move a file to the Trash and got no answer, then was refused when it tried to type into 1Password. They come from an isolated test run - its own state -folder and a stand-in for the helper, so no real screen was touched and nobody's -own log was read - which `node scripts/log-uddrag.mjs` repeats. The `presence` -fields were measured on the Mac that made the run. A test checks that -every line is byte for byte in +folder and stand-ins for the helper and the menu bar icon, so no real screen was +touched and nobody's own log was read - which `node scripts/log-uddrag.mjs` +repeats. In the `presence` fields, the idle times come from the stand-in helper +and the icon version from the stand-in icon; the session count comes from the +isolated state, and the surface is derived. Only the box setting was read from +the Mac that made the run. A test checks that every line is byte for byte in [the full log of that run](https://github.com/Agent360dk/computerMCP/blob/main/test/fixtures/audit-readme.jsonl) and that its chain holds. ```jsonl -{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} -{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} -{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} -{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} -{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} +{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} +{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} +{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} +{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} +{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} ``` diff --git a/mcp-server/README.md b/mcp-server/README.md index 1d75636c..a7033812 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -113,20 +113,22 @@ Here is what that looks like, unedited. In the lines below an agent typed a sentence into TextEdit behind the window the person was using, asked in the menu bar to move a file to the Trash and got no answer, then was refused when it tried to type into 1Password. They come from an isolated test run - its own state -folder and a stand-in for the helper, so no real screen was touched and nobody's -own log was read - which `node scripts/log-uddrag.mjs` repeats. The `presence` -fields were measured on the Mac that made the run. A test checks that -every line is byte for byte in +folder and stand-ins for the helper and the menu bar icon, so no real screen was +touched and nobody's own log was read - which `node scripts/log-uddrag.mjs` +repeats. In the `presence` fields, the idle times come from the stand-in helper +and the icon version from the stand-in icon; the session count comes from the +isolated state, and the surface is derived. Only the box setting was read from +the Mac that made the run. A test checks that every line is byte for byte in [the full log of that run](https://github.com/Agent360dk/computerMCP/blob/main/test/fixtures/audit-readme.jsonl) and that its chain holds. ```jsonl -{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} -{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} -{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} -{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} -{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} +{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} +{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} +{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} +{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} +{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} ``` diff --git a/mcp-server/index.js b/mcp-server/index.js index 52254693..7423a043 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -1153,9 +1153,15 @@ async function runTool(name, args) { return errorResult(`Refused: ${svar.grund}. Nothing was asked and nothing was brought to the front. ` + 'Tell the person in the chat what you need them to do.'); } - return textResult(svar.ok + const res = textResult(svar.ok ? { done: true, hvor: hvorIkon, via: 'menu bar', note: 'The person says it is done. We did not see what was typed, and it is not in the log.' } : { done: false, cancelled: true, hvor: hvorIkon, via: 'menu bar', note: `${svar.grund}. Do not ask again with the same request.` }); + // ⛔ 7/10 (Astra R10): spoergsmaalet her gik til menulinjen, men maalingen (punkt P) + // naaede aldrig loggen - den stod kun paa de veje porten selv spoerger ad. + // Den baeres til udfaldslinjen som et usynligt felt, samme moenster som effekten. + const maaling = tagMaaling(); + if (maaling) Object.defineProperty(res, '__presence', { value: maaling, enumerable: false }); + return res; } // Forgrund: dialogen. SERVEREN skriver hvor det lander, ikke modellen. En // prompt-indsproejtning kan formulere `message` - den kan ikke formulere @@ -1723,8 +1729,12 @@ async function haandterKald(request) { const graense = Math.max(1.5, Number(process.env.CMCP_MENNESKE_SEK) || 0); const slut = Date.now() + 5000; while (laanAktivt() && laanOejeblik() === vedDom && Date.now() < slut) { + // ⛔ 7/10 (Astra R10, MAALT 6,7 s): hvert opslag fik hele sin frist paa 2 s - ogsaa + // det sidste, der startede lige foer loftet. Nu faar det hoejst resttiden. + const tilbage = slut - Date.now(); + if (tilbage < 100) return; let m = null; - try { m = await callHelper(['idle'], { timeout: 2000 }); } catch { m = null; } + try { m = await callHelper(['idle'], { timeout: Math.min(2000, tilbage) }); } catch { m = null; } const idle = Number(m?.idle); if (!(idle >= 0)) return; // ulaeseligt: den endelige vagt afgoer det (den afviser) const sidenEgen = (Date.now() - sidsteEgenHandling) / 1000; @@ -1762,7 +1772,9 @@ async function haandterKald(request) { if (!koordinatEjereFoer) { // 7/10 (punkt I): naas ikke laengere - et ukendt ejer-opslag afvises foer // spoergsmaalet (se KOORDINAT_VAERKTOEJ-blokken). Staar som forsvar i dybden, - // hvis den tidlige afvisning nogensinde fjernes; klik-ejer 9a/9b maaler den. + // hvis den tidlige afvisning nogensinde fjernes. Ingen proeve naar grenen nu: + // klik-ejer 9a/9b standser ved den tidlige afvisning (mutant I1 viser at uden + // den naar et klik igennem efter et ja - Astra R10). const farlig = nu.find(b => ALWAYS_ASK_APPS.has(b) || SPOERG_PR_SESSION.has(b)); if (farlig) return `the window under that point was unknown when it was approved, and it is now ${farlig}`; } else if (somMaengde(nu) !== somMaengde(koordinatEjereFoer)) { @@ -1901,6 +1913,7 @@ async function haandterKald(request) { } record({ tool: name, outcome: 'ok', ...(result?.__effekt ? { effect: result.__effekt } : {}), + ...(result?.__presence ? { asker: 'menubar', presence: result.__presence } : {}), ...(result?.__tookScreen === undefined ? {} : { took_screen: result.__tookScreen }) }); // Kunne UDFALDET ikke skrives, er handlingen sket og sporet mangler en linje. // Det kan ikke goeres om - men det maa ikke vaere tavst. diff --git a/mcp-server/status.js b/mcp-server/status.js index 3fdef9d8..01b0b746 100644 --- a/mcp-server/status.js +++ b/mcp-server/status.js @@ -18,6 +18,9 @@ import { spawn } from 'child_process'; const DIR = process.env.CMCP_STATE_DIR || join(homedir(), '.local', 'state', 'computer-mcp'); export const SESSIONS_DIR = join(DIR, 'sessions'); +/// Ikonet skriver sit procesnummer her (main.swift `pidFil`) - det ikon der ejer denne +/// tilstandsmappe og dens ikon.sock. +export const IKON_PID_FIL = join(DIR, 'status.pid'); const HISTORIK = 20; export const STATUS_IKON_ID = 'dk.agent360.computer-mcp.status'; diff --git a/mcp-server/tilstede.js b/mcp-server/tilstede.js index 8b8f56aa..8246b633 100644 --- a/mcp-server/tilstede.js +++ b/mcp-server/tilstede.js @@ -17,11 +17,11 @@ // navnet siger det. // Kun tal, versioner og til/fra: intet der kan baere en hemmelighed. import { execFile } from 'child_process'; -import { readdirSync, readFileSync } from 'fs'; +import { readdirSync, readFileSync, statSync } from 'fs'; import { join, dirname } from 'path'; import { fileURLToPath } from 'url'; import { callHelper } from './helper.js'; -import { SESSIONS_DIR, STATUS_IKON_ID } from './status.js'; +import { SESSIONS_DIR, STATUS_IKON_ID, IKON_PID_FIL } from './status.js'; const SERVER = (() => { try { return JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), 'package.json'), 'utf8')).version; } @@ -43,11 +43,27 @@ export async function ikonTilstand() { // Aldrig sat = standard = boksen er til (main.swift: `boks-fra` er false som standard). const fra = await koer('/usr/bin/defaults', ['read', STATUS_IKON_ID, 'boks-fra']); const box = fra === '1' ? 'off' : 'on'; - const ps = await koer('/bin/ps', ['-axo', 'comm=']); - const exe = ps?.split('\n').map(s => s.trim()).find(l => l.endsWith('/Contents/MacOS/cmcp-status')); - const icon = exe - ? (await koer('/usr/bin/defaults', ['read', join(dirname(dirname(exe)), 'Info'), 'CFBundleShortVersionString'])) || 'unknown' - : 'not running'; + // ⛔ 7/10 (Astra R10): her stod det FOERSTE cmcp-status i proceslisten, og versionen + // blev laest fra filen paa disken. Var ikonet skiftet ud uden genstart, sagde maalingen + // den nye version om den gamle proces. Nu: det ikon der ejer DENNE tilstandsmappe (dets + // status.pid - samme ikon som fik spoergsmaalet), og er versionsfilen aendret efter at + // processen startede, siges det i stedet for et tal. + let icon = 'not running'; + let pid = null; + try { pid = readFileSync(IKON_PID_FIL, 'utf8').trim(); } catch { pid = null; } + if (pid && /^\d+$/.test(pid)) { + const ps = await koer('/bin/ps', ['-o', 'etime=,comm=', '-p', pid]); + const m = ps?.match(/^\s*([\d:-]+)\s+(.+\/Contents\/MacOS\/cmcp-status)$/); + if (m) { + const indhold = dirname(dirname(m[2])); + const v = await koer('/usr/bin/defaults', ['read', join(indhold, 'Info'), 'CFBundleShortVersionString']); + const [dage, rest] = m[1].includes('-') ? m[1].split('-') : ['0', m[1]]; + const startet = Date.now() - (Number(dage) * 86400 + rest.split(':').reduce((a, x) => a * 60 + Number(x), 0)) * 1000; + let skiftet = false; + try { skiftet = statSync(join(indhold, 'Info.plist')).mtimeMs > startet + 2000; } catch { skiftet = false; } + icon = !v ? 'unknown' : skiftet ? 'replaced since start' : v; + } + } let sessions = 0; try { sessions = readdirSync(SESSIONS_DIR).filter(f => f.endsWith('.json')).length; } catch { sessions = 0; } return { server: SERVER, icon, box, sessions, surface_derived: box === 'on' && sessions > 0 ? 'box+menu' : 'menu' }; @@ -55,7 +71,8 @@ export async function ikonTilstand() { /// Startes naar spoergsmaalet stilles; afsluttes naar det er afgjort. /// Ved et JA maales ingen ny idle: idle_at_end er «answered» (et menneske svarede netop). -/// Hver del venter hoejst 1,5 s, saa et svar aldrig forsinkes mere end det. +/// Hver del venter hoejst 1,5 s (slut-idle og saa start-maalingen), saa et svar forsinkes +/// hoejst ca. 3 s (Opus R10: her stod «hoejst 1,5 s»). const loft = (p, ms, v) => Promise.race([p, new Promise(r => setTimeout(() => r(v), ms))]); export function maalSpoergsmaal() { const start = Promise.all([idleNu(), ikonTilstand()]); diff --git a/scripts/log-uddrag.mjs b/scripts/log-uddrag.mjs index da27dd9e..d260304b 100644 --- a/scripts/log-uddrag.mjs +++ b/scripts/log-uddrag.mjs @@ -19,7 +19,7 @@ import { createServer } from 'node:net'; import { tmpdir } from 'node:os'; import { join, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { lavFalskHjaelper, lavFalskSpoerger } from '../test/falsk-hjaelper.mjs'; +import { lavFalskHjaelper, lavFalskSpoerger, lavStandinIkon } from '../test/falsk-hjaelper.mjs'; const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const UD = join(ROOT, 'test', 'fixtures', 'audit-readme.jsonl'); @@ -39,6 +39,10 @@ const sp = lavFalskSpoerger('udloeb', 'cmcp-log-uddrag-sp'); mkdirSync(STATE, { recursive: true, mode: 0o700 }); const ikon = createServer(sock => { sock.on('data', () => {}); sock.on('error', () => {}); }); await new Promise(r => ikon.listen(join(STATE, 'ikon.sock'), r)); +// Maalingen laeser ikonets version paa det ikon der ejer tilstandsmappen (status.pid): +// et stand-in med pakkens version - aldrig menneskets rigtige ikon (Astra R10). +const VERSION = JSON.parse(readFileSync(join(ROOT, 'mcp-server', 'package.json'), 'utf8')).version; +const standin = lavStandinIkon(STATE, VERSION); const srv = spawn('node', [join(ROOT, 'mcp-server', 'index.js')], { env: { ...process.env, CMCP_STATE_DIR: STATE, CMCP_HELPER: h.sti, CMCP_OSASCRIPT: sp.sti, CMCP_ASK_TIMEOUT: '1', @@ -59,7 +63,7 @@ try { const r = await rpc('tools/call', { name, arguments: args }); console.log(`${name}: ${(r.result?.content?.[0]?.text || '').split('\n')[0].slice(0, 90)}`); } -} finally { srv.kill(); ikon.close(); } +} finally { srv.kill(); ikon.close(); standin.stop(); } const log = readFileSync(join(STATE, 'audit.jsonl'), 'utf8'); writeFileSync(UD, log); rmSync(STATE, { recursive: true, force: true }); diff --git a/test/attrap-faste-opslag.mjs b/test/attrap-faste-opslag.mjs index 839ff293..33a66dbe 100644 --- a/test/attrap-faste-opslag.mjs +++ b/test/attrap-faste-opslag.mjs @@ -48,6 +48,16 @@ if (!RIGTIG || process.platform !== 'darwin') { check('aegteOpslag: apps kommer fra den rigtige hjaelper, ikke det faste svar', Array.isArray(apps.apps) && JSON.stringify(apps.apps) !== JSON.stringify(FASTE_OPSLAG.apps.apps) && !ae.kald().some(k => k.fast), `${apps.apps?.length ?? '?'} programmer`); + // Opus R10: med de faste svar maaler server-e2e ikke laengere de ægte svars FORM. Den + // maales her, laesende: idle (som P og D hviler paa), at og focused. + const id = kald(ae, ['idle']), at = kald(ae, ['at', '--x', '5', '--y', '5']), fo = kald(ae, ['focused']); + check('aegteOpslag: idle er et tal >= 0 fra den rigtige hjaelper', typeof id.idle === 'number' && id.idle >= 0 && id.idle !== FASTE_OPSLAG.idle.idle, JSON.stringify(id).slice(0, 60)); + check('aegteOpslag: at og focused svarer i den aftalte form', typeof at.found === 'boolean' && typeof fo.focused === 'boolean', + `${JSON.stringify(at).slice(0, 50)} · ${JSON.stringify(fo).slice(0, 50)}`); + // press --dry er ogsaa et opslag (Astra R10): det rigtige svar, aldrig attrappens «intet blev udfoert». + const dry = kald(ae, ['press', '--app', 'com.apple.finder', '--title', 'zzz ingen knap hedder saadan', '--dry']); + check('aegteOpslag: press --dry naar den rigtige hjaelper (et svar, ikke et slugt kald)', + !dry.note && (dry.would_press || dry.code), JSON.stringify(dry).slice(0, 90)); } console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); diff --git a/test/efter-udgivelsen.mjs b/test/efter-udgivelsen.mjs index f1fcfcff..72fd9f1c 100644 --- a/test/efter-udgivelsen.mjs +++ b/test/efter-udgivelsen.mjs @@ -37,7 +37,7 @@ function opsaet(navn) { const stub = (n, krop) => { writeFileSync(join(BIN, n), `#!/bin/sh\necho "${n} $*" >> ${LOG}\n${krop}\n`); chmodSync(join(BIN, n), 0o755); }; return { D, K, BARE, BIN, LOG, g, stub }; } -function koer(o, script, { npmV = V, registret = V, login = 'exit 0', prJson = '[]', gitFejl = '' } = {}) { +function koer(o, script, { npmV = V, registret = V, login = 'exit 0', prJson = '[]', gitFejl = '' } = {}, ekstra = []) { writeFileSync(join(o.D, 'registret'), registret); o.stub('npm', `case "$1" in view) echo ${npmV} ;; *) exit 0 ;; esac`); o.stub('curl', `printf '{"servers":[{"server":{"name":"io.github.Agent360dk/computer-mcp","version":"%s"},"_meta":{"io.modelcontextprotocol.registry/official":{"isLatest":true}}}]}' "$(cat ${join(o.D, 'registret')})"`); @@ -45,7 +45,7 @@ function koer(o, script, { npmV = V, registret = V, login = 'exit 0', prJson = ' o.stub('gh', `if [ "$1 $2" = "pr list" ]; then q=""; while [ $# -gt 0 ]; do [ "$1" = "-q" ] && q="$2"; shift; done; printf '%s' '${prJson}' | jq -r "$q"; fi`); writeFileSync(join(o.BIN, 'git'), `#!/bin/sh\nif [ "$1" = "ls-remote" ] && [ -n "${gitFejl}" ]; then exit ${gitFejl || 0}; fi\nexec ${GIT} "$@"\n`); chmodSync(join(o.BIN, 'git'), 0o755); - const r = spawnSync('bash', [script], { cwd: o.K, encoding: 'utf8', timeout: 300000, + const r = spawnSync('bash', [script, ...ekstra], { cwd: o.K, encoding: 'utf8', timeout: 300000, env: { ...process.env, PATH: `${o.BIN}:${process.env.PATH}`, GIT_AUTHOR_NAME: 'p', GIT_AUTHOR_EMAIL: 'p@example.invalid', GIT_COMMITTER_NAME: 'p', GIT_COMMITTER_EMAIL: 'p@example.invalid' } }); return { rc: r.status, ud: (r.stdout || '') + (r.stderr || ''), kald: existsSync(o.LOG) ? readFileSync(o.LOG, 'utf8') : '' }; @@ -93,6 +93,21 @@ const grenFiler = (o) => spawnSync(GIT, ['--git-dir', o.BARE, 'diff', '--name-on { const o = opsaet('f7'); const r = koer(o, 'tools/dok-pr.sh', { gitFejl: '128' }); check('F7 origin nede: stop, intet skrevet', r.rc !== 0 && /kan ikke n(å|aa) origin/.test(r.ud) && o.g('status', '--porcelain').trim() === '', (r.ud.match(/⛔[^\n]*/) || ['-'])[0].slice(0, 80)); } +// F9 (Astra R10) committet fejler én gang efter at grenen er oprettet; naeste koersel +// faerdiggoer committet i stedet for at stoppe med «ingen aendringer». +{ const o = opsaet('f9'); + mkdirSync(join(o.D, 'kroge')); + o.g('config', 'core.hooksPath', join(o.D, 'kroge')); + writeFileSync(join(o.D, 'kroge', 'pre-commit'), '#!/bin/sh\nexit 1\n'); chmodSync(join(o.D, 'kroge', 'pre-commit'), 0o755); + const foer = koer(o, 'tools/dok-pr.sh'); + check('forudsaetning F9: foerste koersel fejler i committet', foer.rc !== 0 && o.g('branch', '--show-current').trim() === GREN, `rc=${foer.rc}`); + writeFileSync(join(o.D, 'kroge', 'pre-commit'), '#!/bin/sh\nexit 0\n'); + const toer = koer(o, 'tools/dok-pr.sh', {}, ['--toer']); + check('F9 toerkoerslen viser det manglende commit og stopper ikke', toer.rc === 0 && /git commit/.test(toer.ud), `rc=${toer.rc}`); + const r = koer(o, 'tools/dok-pr.sh'); + check('F9 genoptaget efter fejlet commit: committet faerdiggjort, skubbet, PR oprettet', r.rc === 0 && /gh pr create/.test(r.kald) + && grenFiler(o).includes('PUBLICERET'), `rc=${r.rc} ${(r.ud.match(/⛔[^\n]*/) || [''])[0].slice(0, 80)}`); } + // F8 GitHubs tomme liste `[]` er IKKE «PR'en findes». { const o = opsaet('f8'); const r = koer(o, 'tools/dok-pr.sh', { prJson: '[]' }); check('F8 tom PR-liste ([]): ingen falsk «findes», PR oprettes', !/findes allerede/.test(r.ud) && /gh pr create/.test(r.kald), `rc=${r.rc}`); } diff --git a/test/falsk-hjaelper.mjs b/test/falsk-hjaelper.mjs index a2cd9124..4ffeae70 100644 --- a/test/falsk-hjaelper.mjs +++ b/test/falsk-hjaelper.mjs @@ -14,7 +14,7 @@ // nu i ALLE port-proever: bryder porten sammen, lander handlingen i en // tekstfil i stedet for paa skaermen, og proeven kan stadig se at den kom. import './ryd-op.mjs'; -import { writeFileSync, chmodSync, mkdtempSync, existsSync, readFileSync, appendFileSync } from 'fs'; +import { writeFileSync, chmodSync, mkdtempSync, mkdirSync, existsSync, readFileSync, appendFileSync } from 'fs'; import { join } from 'path'; import { spawn, spawnSync } from 'child_process'; import { tmpdir } from 'os'; @@ -123,7 +123,11 @@ if (kommando === 'screenshot' && !argv.includes('--plan') && process.env.CMCP_FR error: 'the test stub does not photograph a real screen (set CMCP_FREMMED_MASKINE=1 on a machine nobody is working on)' }) + '\\n'); process.exit(1); } -if (!OPSLAG.has(kommando)) { +// ⛔ 7/10 (Astra R10): «press --dry» er et opslag (hjaelperen svarer og afslutter foer +// trykket - main.swift «if args.flag("dry")» -> Out.ok, og kun press kender --dry), men +// det blev slugt her som en handling. Med aegteOpslag fik proeven derfor aldrig det +// rigtige svar. Uden aegteOpslag svarer de faste svar ovenfor foer vi naar hertil. +if (!OPSLAG.has(kommando) && !argv.includes('--dry')) { writeSync(1, JSON.stringify({ ok: true, note: 'attrap - intet blev udfoert' }) + '\\n'); process.exit(0); } @@ -387,3 +391,25 @@ export const FREMMED_MASKINE = process.env.CMCP_FREMMED_MASKINE === '1'; /// Umaerkelige - men det er stadig input paa hans maskine. (Fable, runde 2.) export const ROER_GRUND = 'umaalt her: sender input i et program mennesket bruger - koer med CMCP_FREMMED_MASKINE=1 paa en maskine der ikke er Gustavs'; export const OPTAG_GRUND = 'umaalt her: optager den rigtige skaerm - koer med CMCP_FREMMED_MASKINE=1 paa en maskine der ikke er Gustavs'; + +/// Et stand-in for menulinje-ikonet, som maalingen (tilstede.js) kan finde: en lille proces +/// paa en sti der ender paa /Contents/MacOS/cmcp-status, en Info.plist med `version`, og +/// dens procesnummer i tilstandsmappens status.pid - som det rigtige ikon skriver det. +/// Saa maaler en proeve DETTE ikon og aldrig menneskets rigtige. +/// ⛔ 7/10: en kopi af /bin/sleep draebes af macOS (Apples egne programmer koerer ikke fra +/// en anden sti, exit 137). Et lille program kompileret til formaalet virker. +export function lavStandinIkon(stateDir, version) { + const dir = mkdtempSync(join(tmpdir(), 'cmcp-standin-ikon-')); + const indhold = join(dir, 'ComputerMCPStatus.app', 'Contents'); + mkdirSync(join(indhold, 'MacOS'), { recursive: true }); + writeFileSync(join(dir, 's.c'), '#include \nint main(void){ sleep(600); return 0; }\n'); + const exe = join(indhold, 'MacOS', 'cmcp-status'); + const cc = spawnSync('cc', ['-o', exe, join(dir, 's.c')], { encoding: 'utf8' }); + if (cc.status !== 0) throw new Error('stand-in-ikonet kunne ikke bygges: ' + (cc.stderr || '').slice(0, 120)); + const plist = join(indhold, 'Info.plist'); + writeFileSync(plist, '\n\n' + + `CFBundleShortVersionString${version}\n`); + const p = spawn(exe, [], { stdio: 'ignore' }); + writeFileSync(join(stateDir, 'status.pid'), String(p.pid)); + return { plist, pid: p.pid, stop() { try { p.kill(); } catch {} } }; +} diff --git a/test/fixtures/audit-readme.jsonl b/test/fixtures/audit-readme.jsonl index bdbaffb4..7ef33210 100644 --- a/test/fixtures/audit-readme.jsonl +++ b/test/fixtures/audit-readme.jsonl @@ -1,7 +1,7 @@ -{"ts":"2026-10-07T17:22:54.385Z","session":"8ee3b910","call":"c698ab9e","tool":"computer_apps","tier":"read","args":{},"target":null,"mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"read-only action","l":1,"kaede":"f90da7ce9496281c"} -{"ts":"2026-10-07T17:22:54.773Z","session":"8ee3b910","call":"c698ab9e","tool":"computer_apps","outcome":"ok","l":1,"kaede":"d179ce3526458624"} -{"ts":"2026-10-07T17:22:54.872Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"be1f9a4917c7","salted":true},"text":{"length":37,"sha256_12":"398c1cc1d6e8","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"50a71f55d7aabdad"} -{"ts":"2026-10-07T17:22:54.873Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"9147ff45d7693513"} -{"ts":"2026-10-07T17:22:54.920Z","session":"8ee3b910","call":"83b357a4","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"5525f8b85ac81a72"} -{"ts":"2026-10-07T17:22:56.072Z","session":"8ee3b910","call":"8cfef444","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"29e715960ace","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"194c926fc5e4cd32"} -{"ts":"2026-10-07T17:22:56.168Z","session":"8ee3b910","call":"09e61a35","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"c5ccf07ac40c","salted":true},"text":{"length":7,"sha256_12":"9ea5b507ea93","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"1c9fd2b00175fac9"} +{"ts":"2026-10-07T17:55:58.448Z","session":"dc2df966","call":"ef894ea9","tool":"computer_apps","tier":"read","args":{},"target":null,"mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"read-only action","l":1,"kaede":"6f618ffe3b66212e"} +{"ts":"2026-10-07T17:55:58.900Z","session":"dc2df966","call":"ef894ea9","tool":"computer_apps","outcome":"ok","l":1,"kaede":"7aaefddba0923231"} +{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} +{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} +{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} +{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} +{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} diff --git a/test/ikon-lyd.mjs b/test/ikon-lyd.mjs index 55bf0048..a8eef6a5 100644 --- a/test/ikon-lyd.mjs +++ b/test/ikon-lyd.mjs @@ -53,6 +53,11 @@ FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ["ly check('10 ikonet har én lyd, og den spilles kun naar skalLyde svarer ja', lyde.length === 1 && /if lydHukommelse\.skalLyde\(nonce: a\.s\.nonce, lukket: a\.lukket, besvaret: a\.besvaret, til: lydSlaaetTil\(\)\) \{\n\s*NSSound\(/.test(main), `${lyde.length} lyde i main.swift`); + // Astra R10: mutanten «nyAnmodning = { _ in ikon.tik() }» overlevede - reglen og lydstedet + // var bevist, men ikke at et nyt spoergsmaal NAAR lydstedet. Kaeden bindes her led for led. + check('13 et nyt spoergsmaal naar lydstedet: socket -> nyAnmodning -> vis(a)', + /anmodninger\.append\(a\)\n\s*nyAnmodning\(a\)/.test(main) && /^nyAnmodning = \{ a in ikon\.vis\(a\) \}$/m.test(main) + && /func vis\(_ a: Anmodning\) \{\n\s*tik\(\)\n\s*if lydHukommelse\.skalLyde\(/.test(main)); check('11 menuen har et punkt der slaar lyden til og fra', /"Play a sound when an agent needs you", action: #selector\(skiftLyd\)/.test(main) && /func skiftLyd\(\) \{ UserDefaults\.standard\.set\(!lydSlaaetTil\(\), forKey: "lyd"\) \}/.test(main)); // README'en lover det standarden giver - begge README'er (claims 45 holder dem ens). diff --git a/test/knap-ord.mjs b/test/knap-ord.mjs index e639c05e..2a27692f 100644 --- a/test/knap-ord.mjs +++ b/test/knap-ord.mjs @@ -116,13 +116,23 @@ writeFileSync(KNAP, JSON.stringify({ ok: false, error: '2 elements match', code: svar = await kald('computer_press', { app: 'com.apple.TextEdit', title: 'OK' }); check('14 ambiguous: intet tryk, ingen spurgt, kandidaterne med', trykket() === f && spoerger.gangeSpurgt() === spurgt && /^Error \(ambiguous\)/.test(svar) && /"matches"/.test(svar), svar.slice(0, 80)); +// 16 (Opus R10, O1): toerkoerslen svarer ikke inden fristen (15 s). Grenen havde ingen +// proeve: erstattet med «ufarlig» trykkede serveren en «Delete» uden at spoerge. +const stubKilde3 = readFileSync(STUB, 'utf8'); +writeFileSync(STUB, stubKilde3.replace(/^ press\) case " \$\* " in \*" --dry "\*\) cat /m, ' press) case " $* " in *" --dry "*) sleep 17; cat ')); +knap('Delete'); f = trykket(); spurgt = spoerger.gangeSpurgt(); +svar = await kald('computer_press', { app: 'com.apple.TextEdit', title: 'Delete' }); +check('16 toerkoerslen naar ikke frem i tide: intet tryk, ingen spurgt, grunden siger det', trykket() === f && spoerger.gangeSpurgt() === spurgt + && /took too long/.test(svar), svar.slice(0, 80)); +writeFileSync(STUB, stubKilde3); + // 15: et klik UDEN app paa et punkt hvis ejer ikke kan slaas op - genmaalingen afviste // det alligevel efter ja'et. Nu afvises det foer, uden spoergsmaal. writeFileSync(AT, JSON.stringify({ ok: true, found: false, under: [] })); f = klikket(); spurgt = spoerger.gangeSpurgt(); svar = await kald('computer_click', { x: 10, y: 10 }); check('15 klik uden app, ukendt ejer: intet klik, ingen spurgt', klikket() === f && spoerger.gangeSpurgt() === spurgt && /could not be identified/.test(svar), svar.slice(0, 80)); -check('10 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8 - ikke om 11-15', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); +check('10 kalibrering: porten spurgte et menneske om 1, 2, 4, 6, 7 og 8 - ikke om 11-16', spoerger.gangeSpurgt() === 6, `spurgt ${spoerger.gangeSpurgt()} gange`); srv.kill(); console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); diff --git a/test/readme-log.mjs b/test/readme-log.mjs index a8bb9243..9778d9f3 100644 --- a/test/readme-log.mjs +++ b/test/readme-log.mjs @@ -8,6 +8,7 @@ import { readFileSync, mkdtempSync, copyFileSync } from 'node:fs'; import { tmpdir, homedir, hostname } from 'node:os'; import { join, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; +import { FASTE_OPSLAG } from './falsk-hjaelper.mjs'; const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const fails = []; @@ -45,6 +46,15 @@ const servere = [...fix.matchAll(/"server":"([^"]+)"/g)].map(m => m[1]); check('loggen er fra den version pakken udgiver (ellers: node scripts/log-uddrag.mjs)', servere.length > 0 && servere.every(v => v === version), `${servere.join(',') || 'ingen'} / ${version}`); +// 3b. README-sætningen om `presence` er bundet til hvor hvert felt kommer fra (Opus R10: +// «målt på Mac'en» var usandt for fire af syv felter, og intet bandt sætningen). +const presence = [...fix.matchAll(/"presence":(\{[^}]*\})/g)].map(m => JSON.parse(m[1])); +check('presence: idle er attrappens faste svar, ikonet er stand-in med pakkens version, sessioner fra den isolerede mappe', + presence.length > 0 && presence.every(p => p.idle_at_ask === FASTE_OPSLAG.idle.idle && p.idle_at_end === FASTE_OPSLAG.idle.idle + && p.icon === version && p.sessions === 1 && p.surface_derived === (p.box === 'on' ? 'box+menu' : 'menu')), JSON.stringify(presence[0] || null)); +const SAETNING = /In the `presence`\s+fields, the idle times come from the stand-in helper\s+and the icon version from the stand-in icon; the session count comes from the\s+isolated state, and the surface is derived\. Only the box setting was read from\s+the Mac that made the run\./; +check('README siger hvor hvert presence-felt kommer fra (samme ordlyd som felterne ovenfor)', SAETNING.test(readme)); + // 4. Intet fra maskinen der skrev den. check('loggen naevner hverken hjemmemappe eller maskinnavn', !fix.includes(homedir()) && !fix.includes(hostname())); diff --git a/test/skaerm-laan.mjs b/test/skaerm-laan.mjs index bfa585b3..eb05c4ec 100644 --- a/test/skaerm-laan.mjs +++ b/test/skaerm-laan.mjs @@ -13,7 +13,7 @@ import './ryd-op.mjs'; import './egen-tilstand.mjs'; import { createServer } from 'node:net'; import { spawn } from 'node:child_process'; -import { mkdtempSync, mkdirSync, writeFileSync, unlinkSync } from 'node:fs'; +import { mkdtempSync, mkdirSync, writeFileSync, unlinkSync, readFileSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { join, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; @@ -190,7 +190,18 @@ try { const d3 = await S.kald('computer_move', { x: 9, y: 9 }); const msD3 = Date.now() - tD3; check('D3 mennesket bliver ved: afvist efter ventetiden, intet flyttes', d3.fejl && /using the keyboard or mouse/.test(d3.tekst) && flyt() === fD3 - && msD3 >= 4500 && msD3 < 8000, `${msD3} ms · ${d3.tekst.slice(0, 60)}`); + && msD3 >= 4500 && msD3 < 6000, `${msD3} ms · ${d3.tekst.slice(0, 60)}`); + // D4 (Astra R10): langsomme opslag (hvert ~1,8 s, under fristen paa 2 s) maa ikke + // traekke ventetiden over loftet. Maalt paa loglinjen «executing», der skrives + // lige efter ventetiden - foer den endelige vagt. + await vent(300); + saet({ idle: { idle: 0.1, _vent: 1700 } }); + const tD4 = Date.now(); + await S.kald('computer_move', { x: 9, y: 9 }); + const exD4 = readFileSync(join(STATE, 'audit.jsonl'), 'utf8').trim().split('\n').map(x => JSON.parse(x)) + .filter(x => x.tool === 'computer_move' && x.phase === 'executing').pop(); + const msD4 = exD4 ? Date.parse(exD4.ts) - tD4 : null; + check('D4 langsomme opslag: ventetiden holder loftet paa 5 s', msD4 !== null && msD4 >= 4500 && msD4 < 6000, `${msD4} ms til «executing»`); saet({ idle: { idle: 30 } }); const flytNu = flyt(); diff --git a/test/tilstede.mjs b/test/tilstede.mjs index 4aa56c50..80d7574a 100644 --- a/test/tilstede.mjs +++ b/test/tilstede.mjs @@ -8,10 +8,10 @@ import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { createServer } from 'node:net'; import { join, dirname } from 'node:path'; -import { mkdtempSync, writeFileSync, readFileSync, chmodSync, rmSync } from 'node:fs'; +import { mkdtempSync, writeFileSync, readFileSync, chmodSync, rmSync, utimesSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { fileURLToPath } from 'node:url'; -import { lavFalskSpoerger } from './falsk-hjaelper.mjs'; +import { lavFalskSpoerger, lavStandinIkon } from './falsk-hjaelper.mjs'; const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const VERSION = JSON.parse(readFileSync(join(ROOT, 'mcp-server', 'package.json'), 'utf8')).version; @@ -40,6 +40,9 @@ const idle = (v) => writeFileSync(IDLE, v === 'fejl' ? 'ikke json' : JSON.string let svar = null; const { mkdirSync } = await import('node:fs'); mkdirSync(STATE, { recursive: true, mode: 0o700 }); +// Maalingen laeser versionen paa det ikon der ejer tilstandsmappen (status.pid) - her et +// stand-in, aldrig menneskets rigtige ikon. +const STANDIN = lavStandinIkon(STATE, '9.9.9-proeve'); const ikon = createServer(sock => { let buf = ''; sock.on('data', d => { @@ -81,7 +84,7 @@ try { check('1 ja: serverens version', p?.server === VERSION, String(p?.server)); check('1 ja: box er on/off, flade afledt af box og sessioner', ['on', 'off'].includes(p?.box) && p?.surface_derived === (p?.box === 'on' && p?.sessions > 0 ? 'box+menu' : 'menu'), `${p?.box} ${p?.sessions} ${p?.surface_derived}`); - check('1 ja: ikonets version er en tekst (maalt paa det koerende ikon)', typeof p?.icon === 'string' && p.icon.length > 0, String(p?.icon)); + check('1 ja: ikonets version er DETTE ikons (status.pid), ikke det foerste i proceslisten', p?.icon === '9.9.9-proeve', String(p?.icon)); // 2. Udloeb (ingen svarer): idle ved slut maales - det tal der fortaeller om nogen var der. idle(3); svar = { svar: null, slutIdle: 47 }; @@ -95,10 +98,23 @@ try { l = sidsteMenubar(); p = l?.presence; check('3 ulaeselig idle: «unreadable», ikke et tal', p?.idle_at_ask === 'unreadable' && p?.idle_at_end === 'unreadable', JSON.stringify(p)); - // 4. Nej (sidst - et nej giver 30 s pause for naeste spoergsmaal). + // 3b. computer_ask_user spoerger ogsaa i menulinjen (Astra R10): maalingen staar paa + // udfaldslinjen, for porten spoerger ikke selv - vaerktoejet goer. + idle(5); svar = { svar: { ok: true, verified: 'owner' }, slutIdle: 0.2 }; + await rpc('tools/call', { name: 'computer_ask_user', arguments: { app: 'Finder', message: 'Type the password in the field' } }); + const spurgt = readFileSync(join(STATE, 'audit.jsonl'), 'utf8').trim().split('\n').map(x => JSON.parse(x)) + .filter(x => x.tool === 'computer_ask_user' && x.outcome === 'ok').pop(); + check('3b ask_user: maalingen staar paa udfaldslinjen', spurgt?.asker === 'menubar' && spurgt?.presence?.idle_at_ask === 5 + && spurgt?.presence?.idle_at_end === 'answered', JSON.stringify(spurgt?.presence || spurgt || 'ingen linje')); + + // 4. Nej (sidst - et nej giver 30 s pause for naeste spoergsmaal). Ikonets versionsfil + // er nu skiftet ud efter at ikonet startede (Astra R10): maalingen maa ikke paastaa den + // nye version om den gamle proces. + const fremtid = new Date(Date.now() + 60000); utimesSync(STANDIN.plist, fremtid, fremtid); idle(8); svar = { svar: { ok: false }, slutIdle: 1.5 }; await rpc('tools/call', kald); l = sidsteMenubar(); p = l?.presence; + check('4 versionsfilen skiftet efter start: «replaced since start», ikke den nye version', p?.icon === 'replaced since start', String(p?.icon)); check('4 nej: idle_at_end maalt efter svaret', p?.idle_at_ask === 8 && p?.idle_at_end === 1.5 && l.decision === 'denied', JSON.stringify(p)); // 5. Kaeden holder med de nye felter. @@ -128,7 +144,7 @@ try { } catch (e) { check('proeven koerte', false, e.message); } finally { - srv.kill(); ikon.close(); rmSync(D, { recursive: true, force: true }); + srv.kill(); ikon.close(); STANDIN.stop(); rmSync(D, { recursive: true, force: true }); } console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); diff --git a/tools/dok-pr.sh b/tools/dok-pr.sh index faf2c0e9..85bde1d5 100755 --- a/tools/dok-pr.sh +++ b/tools/dok-pr.sh @@ -35,7 +35,20 @@ if [ $LOKAL = 1 ] || [ $PAA_ORIGIN = 1 ]; then # Grenen findes: brug den, regenerér intet. [ $LOKAL = 1 ] || goer git fetch origin "$GREN:$GREN" [ "$NU" = "$GREN" ] || { [ -z "$(git status --porcelain)" ] || stop "træet er ikke rent på '$NU' - vis 'git status --short' i chatten"; goer git checkout "$GREN"; } - if [ $TOER = 1 ] && [ $LOKAL = 0 ]; then + # ⛔ R10 (Astra, MÅLT): fejlede committet efter `checkout -b`, stod grenen uden commit og + # ændringerne i træet. Genoptagelsen sammenlignede kun de committede træer og stoppede + # med «ingen ændringer». Står vi på grenen, har den intet commit ud over main, og er der + # ucommittede ændringer i de filer vi selv skriver: færdiggør committet først. + FAERDIGGJORT=0 + if [ "$(git branch --show-current)" = "$GREN" ] && [ "$(git rev-parse "$GREN")" = "$(git rev-parse origin/main)" ] \ + && [ -n "$(git status --porcelain -- $FILER)" ]; then + [ "$(cat PUBLICERET)" = "$V" ] || goer sh -c "echo $V > PUBLICERET" + goer python3 scripts/sync-tal.py + goer git add $FILER + goer git commit -m "release: $V er udgivet - forbeholdene væk" + FAERDIGGJORT=1 + fi + if [ $TOER = 1 ] && { [ $LOKAL = 0 ] || [ $FAERDIGGJORT = 1 ]; }; then echo " (tørkørsel: grenen hentes ikke, så dens ændringer kontrolleres først i den rigtige kørsel)" else T_GREN=$(git rev-parse --verify -q "$GREN^{tree}") || stop "kan ikke læse grenen $GREN" From 6b1a12572c7a54a13ae9ec5367e35d6766a8a7ce Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:20:13 +0200 Subject: [PATCH 095/132] fix(udgivelse): dok-commit tager kun vores egne filer; E7-ankeret entydigt igen (panel R11, Astra) - dok-pr.sh: git commit -- $FILER paa begge veje. Uden stier tog committet hele staging-omraadet med - Astra MAALTE en andens staged index.js paa dok-grenen efter genoptagelse. Den fremmede aendring bliver nu liggende staged. efter-udgivelsen F10 (genoptagelse) og F11 (ny gren); mutanter E10, E11 roede. - E7's anker stod to steder efter R10-rettelsen, saa mutantporten ikke kunne koeres; nu bundet til F6-grenen med kommentarlinjen foran. Alle 117 ankre er entydige. - attrappen: --dry er kun et opslag for press (det eneste der kender --dry); H5 roed. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 30 +++++++++++++++++++++++++++--- test/efter-udgivelsen.mjs | 22 ++++++++++++++++++++++ test/falsk-hjaelper.mjs | 2 +- tools/dok-pr.sh | 7 +++++-- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 2afbd71a..c5491a0f 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1090,8 +1090,8 @@ "forventet": "F6 halv synkronisering", "par": [ [ - " goer python3 scripts/sync-tal.py\n", - "" + " # en halv rettelse, som næste kørsel committede (kun PUBLICERET, forbeholdet stadig på siden).\n goer python3 scripts/sync-tal.py\n", + " # en halv rettelse, som næste kørsel committede (kun PUBLICERET, forbeholdet stadig på siden).\n" ] ] }, @@ -1354,7 +1354,7 @@ "forventet": "aegteOpslag: press --dry", "par": [ [ - "if (!OPSLAG.has(kommando) && !argv.includes('--dry')) {", + "if (!OPSLAG.has(kommando) && !(kommando === 'press' && argv.includes('--dry'))) {", "if (!OPSLAG.has(kommando)) {" ] ] @@ -1394,5 +1394,29 @@ "Every field was read from" ] ] + }, + { + "navn": "E10-genoptagelse-tager-fremmed-staged-med", + "fil": "tools/dok-pr.sh", + "proeve": "test/efter-udgivelsen.mjs", + "forventet": "F10", + "par": [ + [ + "\n goer git commit -m \"release: $V er udgivet - forbeholdene væk\" -- $FILER\n", + "\n goer git commit -m \"release: $V er udgivet - forbeholdene væk\"\n" + ] + ] + }, + { + "navn": "E11-ny-gren-tager-fremmed-staged-med", + "fil": "tools/dok-pr.sh", + "proeve": "test/efter-udgivelsen.mjs", + "forventet": "F11", + "par": [ + [ + "\n goer git commit -m \"release: $V er udgivet - forbeholdene væk\" -- $FILER\n", + "\n goer git commit -m \"release: $V er udgivet - forbeholdene væk\"\n" + ] + ] } ] diff --git a/test/efter-udgivelsen.mjs b/test/efter-udgivelsen.mjs index 72fd9f1c..a636362f 100644 --- a/test/efter-udgivelsen.mjs +++ b/test/efter-udgivelsen.mjs @@ -108,6 +108,28 @@ const grenFiler = (o) => spawnSync(GIT, ['--git-dir', o.BARE, 'diff', '--name-on check('F9 genoptaget efter fejlet commit: committet faerdiggjort, skubbet, PR oprettet', r.rc === 0 && /gh pr create/.test(r.kald) && grenFiler(o).includes('PUBLICERET'), `rc=${r.rc} ${(r.ud.match(/⛔[^\n]*/) || [''])[0].slice(0, 80)}`); } +// F10/F11 (Astra R11, MÅLT): en andens STAGED kildekode maa aldrig komme med paa dok-grenen - +// hverken ved genoptagelse efter et fejlet commit (F10) eller paa den nye gren (F11) - og +// den skal stadig ligge staged bagefter. +const fremmed = (o) => { writeFileSync(join(o.K, 'mcp-server', 'index.js'), readFileSync(join(o.K, 'mcp-server', 'index.js'), 'utf8') + '\n// fremmed\n'); + o.g('add', 'mcp-server/index.js'); }; +{ const o = opsaet('f10'); + mkdirSync(join(o.D, 'kroge')); + o.g('config', 'core.hooksPath', join(o.D, 'kroge')); + writeFileSync(join(o.D, 'kroge', 'pre-commit'), '#!/bin/sh\nexit 1\n'); chmodSync(join(o.D, 'kroge', 'pre-commit'), 0o755); + koer(o, 'tools/dok-pr.sh'); + writeFileSync(join(o.D, 'kroge', 'pre-commit'), '#!/bin/sh\nexit 0\n'); + fremmed(o); + const r = koer(o, 'tools/dok-pr.sh'); + check('F10 genoptagelse: kun vores filer paa dok-grenen, den fremmede aendring stadig staged', r.rc === 0 && /gh pr create/.test(r.kald) + && !grenFiler(o).includes('mcp-server/index.js') && o.g('diff', '--cached', '--name-only').includes('mcp-server/index.js'), + `rc=${r.rc} gren: ${grenFiler(o).join(',').slice(0, 80)}`); } +{ const o = opsaet('f11'); fremmed(o); + const r = koer(o, 'tools/dok-pr.sh'); + check('F11 ny gren: kun vores filer paa dok-grenen, den fremmede aendring stadig staged', r.rc === 0 && /gh pr create/.test(r.kald) + && !grenFiler(o).includes('mcp-server/index.js') && o.g('diff', '--cached', '--name-only').includes('mcp-server/index.js'), + `rc=${r.rc} gren: ${grenFiler(o).join(',').slice(0, 80)}`); } + // F8 GitHubs tomme liste `[]` er IKKE «PR'en findes». { const o = opsaet('f8'); const r = koer(o, 'tools/dok-pr.sh', { prJson: '[]' }); check('F8 tom PR-liste ([]): ingen falsk «findes», PR oprettes', !/findes allerede/.test(r.ud) && /gh pr create/.test(r.kald), `rc=${r.rc}`); } diff --git a/test/falsk-hjaelper.mjs b/test/falsk-hjaelper.mjs index 4ffeae70..8ebce0e1 100644 --- a/test/falsk-hjaelper.mjs +++ b/test/falsk-hjaelper.mjs @@ -127,7 +127,7 @@ if (kommando === 'screenshot' && !argv.includes('--plan') && process.env.CMCP_FR // trykket - main.swift «if args.flag("dry")» -> Out.ok, og kun press kender --dry), men // det blev slugt her som en handling. Med aegteOpslag fik proeven derfor aldrig det // rigtige svar. Uden aegteOpslag svarer de faste svar ovenfor foer vi naar hertil. -if (!OPSLAG.has(kommando) && !argv.includes('--dry')) { +if (!OPSLAG.has(kommando) && !(kommando === 'press' && argv.includes('--dry'))) { writeSync(1, JSON.stringify({ ok: true, note: 'attrap - intet blev udfoert' }) + '\\n'); process.exit(0); } diff --git a/tools/dok-pr.sh b/tools/dok-pr.sh index 85bde1d5..f9c69789 100755 --- a/tools/dok-pr.sh +++ b/tools/dok-pr.sh @@ -45,7 +45,7 @@ if [ $LOKAL = 1 ] || [ $PAA_ORIGIN = 1 ]; then [ "$(cat PUBLICERET)" = "$V" ] || goer sh -c "echo $V > PUBLICERET" goer python3 scripts/sync-tal.py goer git add $FILER - goer git commit -m "release: $V er udgivet - forbeholdene væk" + goer git commit -m "release: $V er udgivet - forbeholdene væk" -- $FILER FAERDIGGJORT=1 fi if [ $TOER = 1 ] && { [ $LOKAL = 0 ] || [ $FAERDIGGJORT = 1 ]; }; then @@ -67,7 +67,10 @@ else [ $TOER = 1 ] || [ -n "$(git status --porcelain -- $FILER)" ] || stop "intet ændret - PUBLICERET og siderne står allerede rigtigt på main? Spørg i chatten" goer git checkout -b "$GREN" goer git add $FILER - goer git commit -m "release: $V er udgivet - forbeholdene væk" + # ⛔ R11 (Astra, MÅLT): `git commit` uden stier tog HELE staging-området med - også en + # andens staged kildekode, som så blev skubbet på dok-grenen. Kun vores egne filer + # committes; alt andet staged bliver liggende urørt. + goer git commit -m "release: $V er udgivet - forbeholdene væk" -- $FILER goer git push origin "$GREN" fi goer gh pr create --repo $REPO --base main --head "$GREN" \ From 25067d7aa76068a0f30caeb17e2ad318524c8837 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:27:21 +0200 Subject: [PATCH 096/132] fix(plugin): pluginnet og markedet foelger PUBLICERET og loeftes i dok-PR'en (panel R11, B5 - begge valgte (a)) Pluginnet fulgte pakkens version, saa markedet paa main pegede paa en version npm ikke havde fra fletning til udgivelse: /plugin install gav npx ...@0.2.2 mod et register med 0.1.0 (Opus MAALTE registret), og serveren startede ikke. - sync-tal.py skriver plugin.json (version + npx-pin) og marketplace.json fra PUBLICERET, idempotent; staar nu paa 0.1.0 = det npm serverer i dag - dok-pr.sh FILER har de to filer med, saa loeftet kommer i dok-PR'en efter publish - release.sh trin 3: package.json/server.json = V; plugin og marked = PUBLICERET - plugin-manifest kraever PUBLICERET; efter-udgivelsen F3 kraever loeftet paa dok-grenen - K1-ankeret er versionsuafhaengigt Forudsaetning: 0.2.2 flettes foerst efter at 0.2.1 er udgivet og dens dok-PR flettet (PUBLICERET 0.2.1); en rebase skal foelges af sync-tal.py (plugin-manifest fanger det). Co-Authored-By: Claude Opus 5.5 --- .claude-plugin/marketplace.json | 2 +- .github/mutanter-porte.json | 4 ++-- plugin/.claude-plugin/plugin.json | 4 ++-- scripts/release.sh | 10 +++++++--- scripts/sync-tal.py | 19 +++++++++++++++++++ test/efter-udgivelsen.mjs | 7 ++++++- test/plugin-manifest.mjs | 13 ++++++++----- tools/dok-pr.sh | 3 ++- 8 files changed, 47 insertions(+), 15 deletions(-) diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 9f4b64fe..7af2823e 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -7,7 +7,7 @@ "name": "computer-mcp", "source": "./plugin", "description": "macOS computer use that stays behind your window, asks before it deletes or sends, refuses password managers, and logs every action.", - "version": "0.2.1", + "version": "0.1.0", "homepage": "https://computermcp.dev", "repository": "https://github.com/Agent360dk/computerMCP", "license": "MIT" diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index c5491a0f..10239dc5 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1114,8 +1114,8 @@ "forventet": "serveren startes med npx", "par": [ [ - "\"@agent360/computer-mcp@0.2.1\"", - "\"@agent360/computer-mcp@latest\"" + "\"-y\", \"@agent360/computer-mcp@", + "\"-y\", \"@agent360/computer-mcp@latest-" ] ] }, diff --git a/plugin/.claude-plugin/plugin.json b/plugin/.claude-plugin/plugin.json index a9708913..3c249a16 100644 --- a/plugin/.claude-plugin/plugin.json +++ b/plugin/.claude-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "computer-mcp", - "version": "0.2.1", + "version": "0.1.0", "description": "macOS computer use that stays behind your window, asks before it deletes or sends, refuses password managers, and logs every action.", "author": { "name": "Agent360", "url": "https://computermcp.dev" }, "homepage": "https://computermcp.dev", @@ -9,7 +9,7 @@ "mcpServers": { "computer-mcp": { "command": "npx", - "args": ["-y", "@agent360/computer-mcp@0.2.1"] + "args": ["-y", "@agent360/computer-mcp@0.1.0"] } } } diff --git a/scripts/release.sh b/scripts/release.sh index 64ac9e6b..a90f5053 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -181,11 +181,15 @@ case "$CIDOM" in esac echo "== 3/7 versionerne skal vaere ens ==" -# 7/10 (panel R8, K): Claude Code-pluginnet og markedet foelger pakken - ellers peger -# `npx @agent360/computer-mcp@` paa en anden version end den der udgives. -for f in mcp-server/package.json server.json plugin/.claude-plugin/plugin.json .claude-plugin/marketplace.json; do +for f in mcp-server/package.json server.json; do grep -q "\"version\": \"$V\"" "$f" || { echo "⛔ $f staar ikke paa $V"; exit 1; } done +# 7/10 (panel R11, B5): Claude Code-pluginnet og markedet foelger PUBLICERET, ikke pakken - +# paa main skal de pege paa en version npm HAR. Trin 0 satte PUBLICERET og koerte +# sync-tal.py, saa her staar de lokalt paa $V; committet kommer i dok-PR'en efter publish. +for f in plugin/.claude-plugin/plugin.json .claude-plugin/marketplace.json; do + grep -q "\"version\": \"$(cat PUBLICERET)\"" "$f" || { echo "⛔ $f foelger ikke PUBLICERET ($(cat PUBLICERET)) - koer python3 scripts/sync-tal.py"; exit 1; } +done grep -q "^## $V" CHANGELOG.md || { echo "⛔ CHANGELOG.md mangler afsnittet ## $V"; exit 1; } echo "== 4/7 vaerktoejstallet skal matche koden ==" diff --git a/scripts/sync-tal.py b/scripts/sync-tal.py index 184bc2cb..89d2dddf 100755 --- a/scripts/sync-tal.py +++ b/scripts/sync-tal.py @@ -324,6 +324,25 @@ def _forbehold(fil, udgivet, n): # Scriptet her redigerer i forvejen den fil (den staar i FLADER). Saa # udledningen hoerer her, foer tallene rettes. `build-release.sh` goer det # samme et oejeblik senere; det skader ikke, og paastand 45 vogter resultatet. +# 7/10 (panel R10-R11, B5 - begge valgte (a)): Claude Code-pluginnet og markedet foelger +# PUBLICERET - den version npx faktisk serverer - ikke pakkens. Stod de paa pakkens +# version, pegede markedet paa main paa en version npm ikke havde fra fletning til +# udgivelse: `/plugin install` gav `npx ...@0.2.2` mod et register med 0.1.0, og serveren +# startede ikke. Loeftet kommer med dok-PR'en efter publish (tools/dok-pr.sh FILER). +if re.fullmatch(r'\d+\.\d+\.\d+', UDGIVET): + for _sti, _moenstre in [('plugin/.claude-plugin/plugin.json', [r'("version": ")[^"]+(")', r'("@agent360/computer-mcp@)[^"]+(")']), + ('.claude-plugin/marketplace.json', [r'("version": ")[^"]+(")'])]: + _p = os.path.join(ROD, _sti) + if not os.path.exists(_p): + continue + _t = io.open(_p, encoding='utf-8').read() + _ny = _t + for _m in _moenstre: + _ny = re.sub(_m, lambda mm: mm.group(1) + UDGIVET + mm.group(2), _ny) + if _ny != _t: + io.open(_p, 'w', encoding='utf-8').write(_ny) + print(' %s foelger nu PUBLICERET (%s)' % (_sti, UDGIVET)) + _rep = io.open(os.path.join(ROD, 'README.md'), encoding='utf-8').read() _npm = re.sub(r' { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; -const V = JSON.parse(readFileSync(join(ROOT, 'mcp-server', 'package.json'), 'utf8')).version; +// ⛔ 7/10 (panel R10-R11, B5): pluginnet fulgte PAKKENS version, og markedet paa main pegede +// derfor paa en version npm ikke havde, fra fletning til udgivelse - en installation der +// ikke kunne starte. Nu foelger det PUBLICERET (sync-tal.py), og dok-PR'en loefter det. +const V = readFileSync(join(ROOT, 'PUBLICERET'), 'utf8').trim(); const marked = JSON.parse(readFileSync(join(ROOT, '.claude-plugin', 'marketplace.json'), 'utf8')); const plugin = JSON.parse(readFileSync(join(ROOT, 'plugin', '.claude-plugin', 'plugin.json'), 'utf8')); const indgang = marked.plugins?.find(p => p.name === 'computer-mcp'); check('markedet har pluginnet og peger paa mappen i repoet', indgang?.source === './plugin', JSON.stringify(indgang?.source)); -check('markedets version = pakkens', indgang?.version === V, `${indgang?.version} / ${V}`); -check('pluginnets version = pakkens', plugin.version === V, `${plugin.version} / ${V}`); +check('markedets version = PUBLICERET (det npm serverer)', indgang?.version === V, `${indgang?.version} / ${V}`); +check('pluginnets version = PUBLICERET', plugin.version === V, `${plugin.version} / ${V}`); const srv = plugin.mcpServers?.['computer-mcp']; -check('serveren startes med npx laast til netop pakkens version', srv?.command === 'npx' +check('serveren startes med npx laast til netop den version npm serverer', srv?.command === 'npx' && JSON.stringify(srv?.args) === JSON.stringify(['-y', `@agent360/computer-mcp@${V}`]), JSON.stringify(srv?.args)); const har = spawnSync('/bin/sh', ['-c', 'command -v claude'], { encoding: 'utf8' }).stdout.trim(); diff --git a/tools/dok-pr.sh b/tools/dok-pr.sh index f9c69789..99a47947 100755 --- a/tools/dok-pr.sh +++ b/tools/dok-pr.sh @@ -10,7 +10,8 @@ cd "$(dirname "$0")/.." V="$(node -p "require('./mcp-server/package.json').version")" GREN="release-$V-dok" REPO=Agent360dk/computerMCP -FILER="PUBLICERET README.md docs mcp-server/README.md server.json" +# Pluginnet og markedet foelger PUBLICERET (sync-tal.py) og loeftes derfor HER, efter publish (panel R11, B5). +FILER="PUBLICERET README.md docs mcp-server/README.md server.json plugin/.claude-plugin/plugin.json .claude-plugin/marketplace.json" TOER=0; [ "${1:-}" = "--toer" ] && TOER=1 stop() { echo "⛔ $*"; exit 1; } goer() { echo " \$ $*"; [ $TOER = 1 ] || "$@"; } From d08d9209cad7f30e898a041f9f27b6b9a1da5f88 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:35:11 +0200 Subject: [PATCH 097/132] test(mutanter): E8's anker fulgte FILER-linjen (B5) - entydigt igen; alle 119 ankre entydige Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 10239dc5..830216de 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1102,8 +1102,8 @@ "forventet": "F3 ...grenen hedder", "par": [ [ - "FILER=\"PUBLICERET README.md docs mcp-server/README.md server.json\"", - "FILER=\"PUBLICERET README.md docs server.json\"" + "FILER=\"PUBLICERET README.md docs mcp-server/README.md server.json ", + "FILER=\"PUBLICERET README.md docs server.json " ] ] }, @@ -1418,5 +1418,29 @@ "\n goer git commit -m \"release: $V er udgivet - forbeholdene væk\"\n" ] ] + }, + { + "navn": "B5a-sync-tal-roerer-ikke-pluginnet", + "fil": "scripts/sync-tal.py", + "proeve": "test/efter-udgivelsen.mjs", + "forventet": "F3 ...dok-PR'en loefter pluginnet", + "par": [ + [ + "if re.fullmatch(r'\\d+\\.\\d+\\.\\d+', UDGIVET):\n for _sti, _moenstre", + "if False:\n for _sti, _moenstre" + ] + ] + }, + { + "navn": "B5b-dok-pr-uden-pluginnet", + "fil": "tools/dok-pr.sh", + "proeve": "test/efter-udgivelsen.mjs", + "forventet": "F3 ...dok-PR'en loefter pluginnet", + "par": [ + [ + " server.json plugin/.claude-plugin/plugin.json .claude-plugin/marketplace.json\"", + " server.json\"" + ] + ] } ] From b7caff8d7cada757246e4f5e9ce7abcf726836d7 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:38:17 +0200 Subject: [PATCH 098/132] release: forbered 0.2.2 - intet udgivet, intet skubbet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versionen er hævet i package.json (+ lock), server.json, gemini-extension.json, bundle/manifest.json, hjaelperen og fejlskabelonen. sync-tal.py har rettet installationssidernes forbehold (0.2.2 bygget, ikke udgivet; npx serverer stadig PUBLICERET). Loguddraget er genereret paa ny (presence.server = 0.2.2). CHANGELOG ## 0.2.2: hver paastand naevner sin proeve. Pluginnet og markedet staar paa PUBLICERET (0.1.0) efter B5 og loeftes i dok-PR'en efter publish. 0.2.2 flettes foerst efter 0.2.1 er udgivet og dens dok-PR flettet; derefter rebase + sync-tal.py + fuld koersel igen. Co-Authored-By: Claude Opus 5.5 --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- CHANGELOG.md | 38 +++++++++++++++++++++ README.md | 10 +++--- bundle/manifest.json | 2 +- docs/docs/install-claude-code/index.html | 2 +- docs/docs/install-claude-desktop/index.html | 2 +- docs/docs/install-codex/index.html | 2 +- docs/docs/install-copilot/index.html | 2 +- docs/docs/install-cursor/index.html | 2 +- docs/docs/install-vscode/index.html | 2 +- gemini-extension.json | 2 +- helper/Sources/cmcp-helper/main.swift | 2 +- mcp-server/README.md | 10 +++--- mcp-server/package-lock.json | 4 +-- mcp-server/package.json | 2 +- server.json | 4 +-- test/fixtures/audit-readme.jsonl | 14 ++++---- 17 files changed, 70 insertions(+), 32 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 494fce38..f8f70ec4 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -30,6 +30,6 @@ body: id: versions attributes: label: macOS version and computer-mcp version - placeholder: "macOS 26.4.1 · computer-mcp 0.2.1" + placeholder: "macOS 26.4.1 · computer-mcp 0.2.2" validations: required: true diff --git a/CHANGELOG.md b/CHANGELOG.md index c9021ce2..7c702a3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,44 @@ Dates are the day the version was tagged. Everything here was measured before it was written down; where a claim has a test, the test is named. +## 0.2.2 + +**It does not ask about what cannot happen.** `computer_press` first runs the +same search as a dry run. If nothing matches, more than one thing matches, or the +lookup does not answer in time, the press is refused and nobody is asked - a yes +to something that could not be pressed was a wasted consent. A click at a point +whose app cannot be identified is refused the same way. (`test/knap-ord.mjs` +11-16, `test/klik-ejer.mjs` 9a/9b) +**Read-only says read-only.** In `readonly` mode a write is refused for that +reason before the send port looks at the screen, so the log gives the real +reason. (`test/readonly-foerst.mjs`) +**Every menu bar question is measured in the log.** Each line where the menu bar +icon asked carries `presence`: seconds since the last keyboard or mouse input +when it was asked and when it ended (or `answered`), the server and icon +versions, whether the box is on, and how many agent sessions were running. Idle +time is input activity, not proof that someone saw the question. +(`test/tilstede.mjs`) +**A sound, if you want one.** Switch it on in the icon's menu: one sound per new +question - not again if the same question is sent twice, and not when it +expires. (`test/ikon-lyd.mjs`) +**A step during a screen loan waits for you.** If you are using the keyboard or +mouse, the step now waits up to five seconds for a pause instead of telling the +agent to call again; if you keep going, it is refused and nothing moves. +(`test/skaerm-laan.mjs` D1-D4) +**One file for Claude Desktop, one command for Claude Code.** The GitHub release +carries `computer-mcp.mcpb` and its checksum, built and started in the release +workflow without downloading anything. The repo is a Claude Code plugin +marketplace (`/plugin marketplace add Agent360dk/computerMCP`), pinned to the +version npm serves. (`test/mcpb-start.mjs`, `test/plugin-manifest.mjs`) +**The README shows the log as it is.** Lines from an isolated run, byte for +byte, with the chain checked. (`test/readme-log.mjs`) +**For contributors:** tests that use the stand-in helper no longer depend on +what is on the developer's screen, the tests that start a server get their own +state folder, and the release tooling says "unknown" when it cannot tell and can +be resumed after a failure. +(`test/attrap-faste-opslag.mjs`, `test/tilstand-isoleret.mjs`, +`test/release-fejlmatrix.mjs`, `test/efter-udgivelsen.mjs`) + ## 0.2.1 The first release since 0.1.0. A `v0.2.0` tag exists on GitHub from 20 diff --git a/README.md b/README.md index 8c4d6fb6..122aedd6 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,11 @@ and that its chain holds. ```jsonl -{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} -{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} -{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} -{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} -{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} +{"ts":"2026-10-07T18:36:13.804Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"c4d885ae85a3","salted":true},"text":{"length":37,"sha256_12":"53b5b18d7c2b","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"608dbed0e6cb4d58"} +{"ts":"2026-10-07T18:36:13.805Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"08e8f505e7d0e7c8"} +{"ts":"2026-10-07T18:36:13.852Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"b8ecd7f441ea98b3"} +{"ts":"2026-10-07T18:36:15.004Z","session":"0636dcef","call":"558fe0f1","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"6e84f8d2198c","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.2","icon":"0.2.2","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"98e213d5869cb131"} +{"ts":"2026-10-07T18:36:15.087Z","session":"0636dcef","call":"56b7802a","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"0c1139ec706b","salted":true},"text":{"length":7,"sha256_12":"a2acf331b097","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"81e0ef24b729b4e6"} ``` diff --git a/bundle/manifest.json b/bundle/manifest.json index ffd122cc..089baa76 100644 --- a/bundle/manifest.json +++ b/bundle/manifest.json @@ -2,7 +2,7 @@ "manifest_version": "0.3", "name": "computer-mcp", "display_name": "Computer MCP", - "version": "0.2.1", + "version": "0.2.2", "description": "macOS computer use you can leave running: it stays behind your window and never touches passwords.", "long_description": "A macOS computer-use MCP server built for the hours you are not watching. It acts in windows behind the one you are in and leaves your pointer alone, it says so when something fails, several can run at once, and it will not go near your password manager. Every action is written to an append-only audit log. Runs in any MCP client, macOS, MIT, no account.", "author": { diff --git a/docs/docs/install-claude-code/index.html b/docs/docs/install-claude-code/index.html index 52e0827c..7fad2c45 100644 --- a/docs/docs/install-claude-code/index.html +++ b/docs/docs/install-claude-code/index.html @@ -95,7 +95,7 @@

Install Computer MCP for Claude Code

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/docs/docs/install-claude-desktop/index.html b/docs/docs/install-claude-desktop/index.html index 1833a4c7..db388116 100644 --- a/docs/docs/install-claude-desktop/index.html +++ b/docs/docs/install-claude-desktop/index.html @@ -95,7 +95,7 @@

Install Computer MCP for Claude Desktop

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/docs/docs/install-codex/index.html b/docs/docs/install-codex/index.html index 6d54060c..6838a86d 100644 --- a/docs/docs/install-codex/index.html +++ b/docs/docs/install-codex/index.html @@ -95,7 +95,7 @@

Install Computer MCP for OpenAI Codex

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/docs/docs/install-copilot/index.html b/docs/docs/install-copilot/index.html index fd4551e4..b6ae1088 100644 --- a/docs/docs/install-copilot/index.html +++ b/docs/docs/install-copilot/index.html @@ -95,7 +95,7 @@

Install Computer MCP for GitHub Copilot

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/docs/docs/install-cursor/index.html b/docs/docs/install-cursor/index.html index f006376d..ae6509e7 100644 --- a/docs/docs/install-cursor/index.html +++ b/docs/docs/install-cursor/index.html @@ -95,7 +95,7 @@

Install Computer MCP for Cursor

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/docs/docs/install-vscode/index.html b/docs/docs/install-vscode/index.html index 5c73fd28..415f5a0a 100644 --- a/docs/docs/install-vscode/index.html +++ b/docs/docs/install-vscode/index.html @@ -95,7 +95,7 @@

Install Computer MCP for VS Code

access, window control, moving windows between screens, pasting, opening and quitting apps, waiting for something to appear, writing into a field behind another window, and asking you for a password without the model ever seeing it. -Those ship with 0.2.1, which is built and tested but not published yet.

+Those ship with 0.2.2, which is built and tested but not published yet.

Everything else on this page works with what you install today. If you want all of them now, build from source: about thirty-five seconds, and nothing to download.

diff --git a/gemini-extension.json b/gemini-extension.json index b9365ff7..069ebf76 100644 --- a/gemini-extension.json +++ b/gemini-extension.json @@ -1,6 +1,6 @@ { "name": "computer-mcp", - "version": "0.2.1", + "version": "0.2.2", "description": "Drive macOS from any MCP client with the guardrails on by default: password fields blacked out in memory before the screenshot is written, password managers that are refused and terminals that ask once per session, and a log the server only appends to that never stores typed text in clear. 32 tools, 14 read-only. No API key, MIT.", "mcpServers": { "computer": { diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index d48b55ae..c850f0d0 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -22,7 +22,7 @@ func modtager(_ args: Args) -> pid_t? { } -let HELPER_VERSION = "0.2.1" +let HELPER_VERSION = "0.2.2" let args = Args(CommandLine.arguments) diff --git a/mcp-server/README.md b/mcp-server/README.md index a7033812..503b6e08 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -124,11 +124,11 @@ and that its chain holds. ```jsonl -{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} -{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} -{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} -{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} -{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} +{"ts":"2026-10-07T18:36:13.804Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"c4d885ae85a3","salted":true},"text":{"length":37,"sha256_12":"53b5b18d7c2b","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"608dbed0e6cb4d58"} +{"ts":"2026-10-07T18:36:13.805Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"08e8f505e7d0e7c8"} +{"ts":"2026-10-07T18:36:13.852Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"b8ecd7f441ea98b3"} +{"ts":"2026-10-07T18:36:15.004Z","session":"0636dcef","call":"558fe0f1","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"6e84f8d2198c","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.2","icon":"0.2.2","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"98e213d5869cb131"} +{"ts":"2026-10-07T18:36:15.087Z","session":"0636dcef","call":"56b7802a","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"0c1139ec706b","salted":true},"text":{"length":7,"sha256_12":"a2acf331b097","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"81e0ef24b729b4e6"} ``` diff --git a/mcp-server/package-lock.json b/mcp-server/package-lock.json index 322c8b49..eb6d97ce 100644 --- a/mcp-server/package-lock.json +++ b/mcp-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@agent360/computer-mcp", - "version": "0.2.1", + "version": "0.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@agent360/computer-mcp", - "version": "0.2.1", + "version": "0.2.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/sdk": "^1.0.0" diff --git a/mcp-server/package.json b/mcp-server/package.json index 8cfa4d59..9bdfd659 100644 --- a/mcp-server/package.json +++ b/mcp-server/package.json @@ -1,6 +1,6 @@ { "name": "@agent360/computer-mcp", - "version": "0.2.1", + "version": "0.2.2", "mcpName": "io.github.Agent360dk/computer-mcp", "description": "Computer use you can actually leave running. It works in windows behind the one you are in and leaves your pointer alone, it says so when something fails instead of pretending, several can run at once, and it will not go near your password manager. Everything is logged. macOS, MIT, no account.", "type": "module", diff --git a/server.json b/server.json index 92c30de4..4bc684c1 100644 --- a/server.json +++ b/server.json @@ -7,13 +7,13 @@ "url": "https://github.com/Agent360dk/computerMCP", "source": "github" }, - "version": "0.2.1", + "version": "0.2.2", "websiteUrl": "https://computermcp.dev", "packages": [ { "registryType": "npm", "identifier": "@agent360/computer-mcp", - "version": "0.2.1", + "version": "0.2.2", "transport": { "type": "stdio" }, diff --git a/test/fixtures/audit-readme.jsonl b/test/fixtures/audit-readme.jsonl index 7ef33210..7e299be9 100644 --- a/test/fixtures/audit-readme.jsonl +++ b/test/fixtures/audit-readme.jsonl @@ -1,7 +1,7 @@ -{"ts":"2026-10-07T17:55:58.448Z","session":"dc2df966","call":"ef894ea9","tool":"computer_apps","tier":"read","args":{},"target":null,"mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"read-only action","l":1,"kaede":"6f618ffe3b66212e"} -{"ts":"2026-10-07T17:55:58.900Z","session":"dc2df966","call":"ef894ea9","tool":"computer_apps","outcome":"ok","l":1,"kaede":"7aaefddba0923231"} -{"ts":"2026-10-07T17:55:58.998Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"3e9c83b229c0","salted":true},"text":{"length":37,"sha256_12":"f15c7baa42de","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"475a9d8ac795a5f9"} -{"ts":"2026-10-07T17:55:59.000Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"159585c2aa01e8e6"} -{"ts":"2026-10-07T17:55:59.049Z","session":"dc2df966","call":"9388ce3a","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"95b41465001538e3"} -{"ts":"2026-10-07T17:56:00.204Z","session":"dc2df966","call":"6973c21b","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"1f46e1f913e6","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.1","icon":"0.2.1","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"fd7ff84ca107bc0d"} -{"ts":"2026-10-07T17:56:00.302Z","session":"dc2df966","call":"aeba5ae9","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"f028f3fe8c2a","salted":true},"text":{"length":7,"sha256_12":"1cc785567109","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"71c2a130dc84d2fd"} +{"ts":"2026-10-07T18:36:13.244Z","session":"0636dcef","call":"dc38fe77","tool":"computer_apps","tier":"read","args":{},"target":null,"mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"read-only action","l":1,"kaede":"6e6660cbd2b09c2b"} +{"ts":"2026-10-07T18:36:13.712Z","session":"0636dcef","call":"dc38fe77","tool":"computer_apps","outcome":"ok","l":1,"kaede":"052b51ad780313d9"} +{"ts":"2026-10-07T18:36:13.804Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","args":{"app":{"length":8,"sha256_12":"c4d885ae85a3","salted":true},"text":{"length":37,"sha256_12":"53b5b18d7c2b","salted":true}},"target":"com.apple.TextEdit","mode":"allow","asker":"custom","decision":"allowed","asked":false,"reason":"CMCP_MODE=allow","l":1,"kaede":"608dbed0e6cb4d58"} +{"ts":"2026-10-07T18:36:13.805Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","tier":"write","target":"com.apple.TextEdit","phase":"executing","l":1,"kaede":"08e8f505e7d0e7c8"} +{"ts":"2026-10-07T18:36:13.852Z","session":"0636dcef","call":"2e0ef272","tool":"computer_type","outcome":"ok","effect":"sent","l":1,"kaede":"b8ecd7f441ea98b3"} +{"ts":"2026-10-07T18:36:15.004Z","session":"0636dcef","call":"558fe0f1","tool":"computer_menu","tier":"write","args":{"app":{"length":6,"sha256_12":"6e84f8d2198c","salted":true},"path":"File > Move to Trash"},"target":"com.apple.finder","mode":"allow","asker":"menubar","presence":{"idle_at_ask":600,"idle_at_end":600,"server":"0.2.2","icon":"0.2.2","box":"on","sessions":1,"surface_derived":"box+menu"},"decision":"denied","asked":true,"reason":"background mode: nobody answered in the menu bar in time","l":1,"kaede":"98e213d5869cb131"} +{"ts":"2026-10-07T18:36:15.087Z","session":"0636dcef","call":"56b7802a","tool":"computer_type","tier":"write","args":{"app":{"length":9,"sha256_12":"0c1139ec706b","salted":true},"text":{"length":7,"sha256_12":"a2acf331b097","salted":true}},"target":"com.1password.1password","mode":"allow","asker":"custom","decision":"denied","asked":false,"reason":"background mode: this would need a dialog, and a dialog takes the screen (a password app can never be approved from the menu bar)","l":1,"kaede":"81e0ef24b729b4e6"} From f41239a77bd70f8b6719dbee391f3e8e7ae58d36 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 20:55:59 +0200 Subject: [PATCH 099/132] docs(changelog): 0.2.2-afsnittet lover kun det koden og proeverne viser (panel R12, Astra + Opus) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Claude Code: to kommandoer (marketplace add + install), ikke «one command»; pinnet «til den nyeste version paa npm, loeftet efter hver udgivelse» - MCPB: bygges i workflowet (npm install) og tjekkes at starte fra den udpakkede pakke med npm offline - ikke «uden at hente noget» - readonly: foer sende-porten OG tryk-opslaget; presence: «answered» kun ved ja - bidragydere: kun de fem opslag faar faste svar; serverprøver i suiten faar egen tilstandsmappe, den manuelle Touch ID-proeve med vilje ikke - ci.yml koerer plugin-manifest (Opus: saa bliver main roed hvis pluginnet ikke foelger PUBLICERET - forudsaetning 6 maskintjekket) - ikon-lyd 12b binder CHANGELOG'ens lyd-saetning til LYD_STANDARD Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 6 ++++++ CHANGELOG.md | 28 ++++++++++++++++------------ test/ikon-lyd.mjs | 4 ++++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9b38263..e3669860 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,6 +76,12 @@ jobs: - name: Ikonets lyd-regel run: node test/ikon-lyd.mjs + # 7/10 (panel R12, Opus): pluginnet skal pege paa PUBLICERET - den version npm + # serverer. Flettes en gren uden at sync-tal.py har koert efter en udgivelse, + # bliver main roed her, og release.sh nægter at udgive. + - name: Pluginnet peger paa den version npm serverer + run: node test/plugin-manifest.mjs + - name: Det der IKKE er proevet her # En groen koersel maa ikke kunne forveksles med en fuld proeve. # Tilgaengelighed og Skaermoptagelse kan ikke gives paa en byggekoerer, diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c702a3e..134e6883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,11 +12,11 @@ to something that could not be pressed was a wasted consent. A click at a point whose app cannot be identified is refused the same way. (`test/knap-ord.mjs` 11-16, `test/klik-ejer.mjs` 9a/9b) **Read-only says read-only.** In `readonly` mode a write is refused for that -reason before the send port looks at the screen, so the log gives the real -reason. (`test/readonly-foerst.mjs`) +reason before the send port or the press lookup looks at the screen, so the log +gives the real reason. (`test/readonly-foerst.mjs`) **Every menu bar question is measured in the log.** Each line where the menu bar icon asked carries `presence`: seconds since the last keyboard or mouse input -when it was asked and when it ended (or `answered`), the server and icon +when it was asked and when it ended (`answered` if the answer was yes), the server and icon versions, whether the box is on, and how many agent sessions were running. Idle time is input activity, not proof that someone saw the question. (`test/tilstede.mjs`) @@ -27,17 +27,21 @@ expires. (`test/ikon-lyd.mjs`) mouse, the step now waits up to five seconds for a pause instead of telling the agent to call again; if you keep going, it is refused and nothing moves. (`test/skaerm-laan.mjs` D1-D4) -**One file for Claude Desktop, one command for Claude Code.** The GitHub release -carries `computer-mcp.mcpb` and its checksum, built and started in the release -workflow without downloading anything. The repo is a Claude Code plugin -marketplace (`/plugin marketplace add Agent360dk/computerMCP`), pinned to the -version npm serves. (`test/mcpb-start.mjs`, `test/plugin-manifest.mjs`) +**One file for Claude Desktop, and a plugin for Claude Code.** The GitHub release +carries `computer-mcp.mcpb` and its checksum; the release workflow builds it and +checks that it starts from the unpacked bundle with npm offline. The repo is a +Claude Code plugin marketplace: `/plugin marketplace add Agent360dk/computerMCP`, +then `/plugin install computer-mcp@agent360`. The plugin is pinned to the newest +version on npm and raised after each release. (`test/mcpb-start.mjs`, +`test/plugin-manifest.mjs`) **The README shows the log as it is.** Lines from an isolated run, byte for byte, with the chain checked. (`test/readme-log.mjs`) -**For contributors:** tests that use the stand-in helper no longer depend on -what is on the developer's screen, the tests that start a server get their own -state folder, and the release tooling says "unknown" when it cannot tell and can -be resumed after a failure. +**For contributors:** the five lookups a gate verdict depends on (what is in +front, what is under a point, what has focus, what a press would hit, and how +long since the last input) get fixed answers in the stand-in helper unless a +test asks for the real ones; every test the suite runs that starts a server gets +its own state folder (the manual Touch ID test deliberately does not); and the +release tooling says when it cannot tell and can be resumed after a failure. (`test/attrap-faste-opslag.mjs`, `test/tilstand-isoleret.mjs`, `test/release-fejlmatrix.mjs`, `test/efter-udgivelsen.mjs`) diff --git a/test/ikon-lyd.mjs b/test/ikon-lyd.mjs index a8eef6a5..6bcbb34d 100644 --- a/test/ikon-lyd.mjs +++ b/test/ikon-lyd.mjs @@ -65,6 +65,10 @@ FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ["ly const lover = standard ? /each new question plays one sound; switch it off in the icon's menu/i : /Switch it on in the icon's menu, and each new\s+question plays one sound/; check('12 README lover den standard ikonet har', lover.test(readme), standard ? 'til' : 'tilvalg'); + // ...og CHANGELOG'ens afsnit om lyden (Opus R12: ellers bliver den usand uden at nogen ser det). + const log = readFileSync(join(ROOT, 'CHANGELOG.md'), 'utf8'); + const loverLog = standard ? /each new question plays one sound/i : /\*\*A sound, if you want one\.\*\* Switch it on in the icon's menu/; + check('12b CHANGELOG lover den standard ikonet har', loverLog.test(log), standard ? 'til' : 'tilvalg'); } catch (e) { check('proeven koerte', false, String(e.stderr || e.message).slice(0, 200)); } finally { From 9b99acd94e68ed62644c4e5252bdb6c28c13be9c Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Wed, 7 Oct 2026 22:05:16 +0200 Subject: [PATCH 100/132] test(sende-port): r4e - Send-bindingen maales igen efter et fejlet opslag (fuld mutantport fandt R4 overlevende) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hele mutantporten paa kandidaten f41239a: 118 roede, 1 overlevede - R4 (opslagsfejl springer bindingen over). Siden punkt I afviser tryk-porten allerede et fejlet «press --dry», saa r4b naaede aldrig bindingen og bestod paa I's afvisning. Et klik med navngivet app har ingen tidlig afvisning: r4e lader opslaget under klikket fejle og kraever afvist, ikke spurgt, intet klikket. R4 retter sig nu mod r4e og er roed. r4b bliver staaende (den maaler I's afvisning end-to-end). Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 2 +- test/sende-port.mjs | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 830216de..773733e4 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -605,7 +605,7 @@ ] ], "proeve": "test/sende-port.mjs", - "forventet": "r4b" + "forventet": "r4e" }, { "navn": "R4-browser-kun-fokus-titel", diff --git a/test/sende-port.mjs b/test/sende-port.mjs index 9a449c0d..8a554839 100644 --- a/test/sende-port.mjs +++ b/test/sende-port.mjs @@ -264,6 +264,17 @@ try { check('r4b opslaget af Send-kontrollen fejler: afvist, ikke spurgt, intet trykket', r.fejl && spurgt.length === foer && handlinger().filter(x => x === 'press').length === p0, r.tekst.slice(0, 110)); } + // r4e (7/10, fuld mutantport paa 0.2.2-kandidaten): siden punkt I afviser tryk-porten + // allerede et fejlet «press --dry», saa r4b naar aldrig bindingen - mutant R4 overlevede. + // Et KLIK med navngivet app har ingen tidlig afvisning: et fejlet opslag af kontrollen + // under punktet skal stadig binde - afvist, ikke spurgt, intet klikket. + { + foer = spurgt.length; svar({ samtale: SAMTALE, at: { ok: false, error: 'opslaget fejlede', code: 'ax-timeout' } }); + const c0 = handlinger().filter(x => x === 'click').length; + const r = await kald('computer_click', { app: 'WhatsApp', x: 585, y: 620 }); + check('r4e opslaget af kontrollen under et klik fejler: afvist, ikke spurgt, intet klikket', r.fejl && spurgt.length === foer + && handlinger().filter(x => x === 'click').length === c0, r.tekst.slice(0, 110)); + } { foer = spurgt.length; svar({ samtale: { ...SAMTALE, window: 'Wikipedia - Google Chrome' }, From 328c2406bd70796271f8e3054f3c57622612fb8b Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Thu, 8 Oct 2026 15:19:33 +0200 Subject: [PATCH 101/132] fix(0.2.2): to fejl i udgivelsesvejen + plugin-vejen paa fladerne (panel R13-R14, Astra + Opus) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fejl a: release.sh advarede « den samtykkemodel README og koden har (foerste skrivning spoerger, et ja daekker sessionen). claims 51 afviser nu formuleringen (kalibreret begge veje). - Plugin-vejen (marketplace add + install) i README, npm-README, Claude Code- installationssiden og llms-install. plugin-manifest binder teksten til manifesternes navne; mutant C4. Alle 122 ankre entydige. Den frosne kandidat 9b99acd er afloest; fuld koersel og port sker paa den endelige kandidat efter rebase (B3). Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 40 ++++++++++++++++++++++-- README.md | 7 +++++ bundle/manifest.json | 2 +- docs/docs/install-claude-code/index.html | 1 + docs/llms-install.md | 7 +++++ mcp-server/README.md | 7 +++++ scripts/release.sh | 10 ++++-- scripts/sync-tal.py | 18 +++++++---- test/claims.mjs | 7 +++-- test/plugin-manifest.mjs | 6 ++++ test/release-fejlmatrix.mjs | 7 ++++- test/sync-tal-versioner.mjs | 11 +++++++ 12 files changed, 108 insertions(+), 15 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 773733e4..ca30ea11 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1054,8 +1054,8 @@ "forventet": "S4 deprecate fejler", "par": [ [ - " printf \" npm deprecate '%s' '%s'\\n\" \"@agent360/computer-mcp@<$V\" \"$DEPR_BESKED\"; }", - " echo \" npm deprecate @agent360/computer-mcp@<$V \\\"...\\\"\"; }" + " printf \" npm deprecate '%s' '%s'\\n\" \"@agent360/computer-mcp@$SAARBAR\" \"$DEPR_BESKED\"; }", + " echo \" npm deprecate @agent360/computer-mcp@$SAARBAR \\\"...\\\"\"; }" ] ] }, @@ -1442,5 +1442,41 @@ " server.json\"" ] ] + }, + { + "navn": "A1-advarsel-rammer-0.2.1", + "fil": "scripts/release.sh", + "proeve": "test/release-fejlmatrix.mjs", + "forventet": "S6 advarslen rammer kun versioner foer 0.2.1", + "par": [ + [ + "SAARBAR=\"<0.2.1\"", + "SAARBAR=\"<$V\"" + ] + ] + }, + { + "navn": "B1-forbehold-ved-samme-vaerktoejstal", + "fil": "scripts/sync-tal.py", + "proeve": "test/sync-tal-versioner.mjs", + "forventet": "samme vaerktoejstal som kilden", + "par": [ + [ + "VAERKTOEJS_AFSTAND = AFSTAND and (K is None or K != N)", + "VAERKTOEJS_AFSTAND = AFSTAND" + ] + ] + }, + { + "navn": "C4-plugin-vejen-forsvinder-fra-README", + "fil": "README.md", + "proeve": "test/plugin-manifest.mjs", + "forventet": "README.md viser plugin-vejen", + "par": [ + [ + "/plugin install computer-mcp@agent360", + "/plugin install computer-mcp" + ] + ] } ] diff --git a/README.md b/README.md index 122aedd6..bfedbc62 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,13 @@ purpose and the test goes red. See [Testing](#testing). claude mcp add computer -- npx -y @agent360/computer-mcp ``` +Or, inside Claude Code, as a plugin pinned to the version on npm: + +```text +/plugin marketplace add Agent360dk/computerMCP +/plugin install computer-mcp@agent360 +``` + ```jsonc // Cursor, VS Code, Codex CLI - mcp.json { diff --git a/bundle/manifest.json b/bundle/manifest.json index 089baa76..450f1bb8 100644 --- a/bundle/manifest.json +++ b/bundle/manifest.json @@ -36,7 +36,7 @@ "mode": { "type": "string", "title": "Mode", - "description": "readonly = only read tools · ask = confirm each write · allow = drive without asking (default)", + "description": "readonly = the agent can look, not touch · ask = the first write asks you, and one yes covers the session · allow = writes go ahead without asking, still logged (default)", "default": "allow", "required": false } diff --git a/docs/docs/install-claude-code/index.html b/docs/docs/install-claude-code/index.html index 7fad2c45..1436256a 100644 --- a/docs/docs/install-claude-code/index.html +++ b/docs/docs/install-claude-code/index.html @@ -115,6 +115,7 @@

Install Computer MCP for Claude Code

Step 1: Add the server to Claude Code

claude mcp add --scope user computer -- npx -y @agent360/computer-mcp@latest

--scope user registers it once for every project instead of only the folder you happen to be standing in.

+

Or install it as a plugin from inside Claude Code, pinned to the version on npm: /plugin marketplace add Agent360dk/computerMCP, then /plugin install computer-mcp@agent360.

Step 1b: pick the mode before the first run

Claude Codeclaude mcp add computer -- npx -y @agent360/computer-mcp
Cursor / VS Code / CodexIn mcp.json: {"command":"npx","args":["-y","@agent360/computer-mcp"]}
diff --git a/docs/llms-install.md b/docs/llms-install.md index 69e878fc..ee06b00e 100644 --- a/docs/llms-install.md +++ b/docs/llms-install.md @@ -28,6 +28,13 @@ Claude Code: claude mcp add --scope user computer -- npx -y @agent360/computer-mcp@latest ``` +Or, inside Claude Code, as a plugin pinned to the version npm serves: + +```text +/plugin marketplace add Agent360dk/computerMCP +/plugin install computer-mcp@agent360 +``` + OpenAI Codex: ```bash diff --git a/mcp-server/README.md b/mcp-server/README.md index 503b6e08..bf3bc8a9 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -142,6 +142,13 @@ purpose and the test goes red. See [Testing](#testing). claude mcp add computer -- npx -y @agent360/computer-mcp ``` +Or, inside Claude Code, as a plugin pinned to the version on npm: + +```text +/plugin marketplace add Agent360dk/computerMCP +/plugin install computer-mcp@agent360 +``` + ```jsonc // Cursor, VS Code, Codex CLI - mcp.json { diff --git a/scripts/release.sh b/scripts/release.sh index a90f5053..d3cf83c4 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -310,12 +310,16 @@ echo "== 6/7 npm ==" trap - EXIT # ⛔ 25/9 (fyld-tjek): 0.1.0 har fejl-aaben sloering (maalt ved 9e251ce). Den der har # laast sig til den, skal have en advarsel - ikke bare dem der opgraderer selv. -DEPR_BESKED="Upgrade to $V: earlier versions could return an unredacted screenshot when redaction failed." +# ⛔ 8/10 (panel R13-R14, fejl a): intervallet var «<$V». Ved 0.2.2 ville advarslen om et +# usloeret skaermbillede ogsaa ramme 0.2.1 - den version der rettede fejlen. Fejlen +# findes kun foer 0.2.1, saa intervallet er fast. +SAARBAR="<0.2.1" +DEPR_BESKED="Upgrade to $V: versions before 0.2.1 could return an unredacted screenshot when redaction failed." # 7/10: reservelinjen var ikke til at koere (ucitéret `<` er en omdirigering, og # beskeden stod som «...»). Nu skrives den ud ordret og citeret. -npm deprecate "@agent360/computer-mcp@<$V" "$DEPR_BESKED" \ +npm deprecate "@agent360/computer-mcp@$SAARBAR" "$DEPR_BESKED" \ || { echo " ⚠ npm deprecate fejlede - koer den i haanden, ordret:" - printf " npm deprecate '%s' '%s'\n" "@agent360/computer-mcp@<$V" "$DEPR_BESKED"; } + printf " npm deprecate '%s' '%s'\n" "@agent360/computer-mcp@$SAARBAR" "$DEPR_BESKED"; } # ⛔ Foerst NU er forbeholdet usandt. `PUBLICERET` er den eneste kilde til hvad # npx faktisk serverer, og sync-tal.py fjerner forbeholdet overalt naar den diff --git a/scripts/sync-tal.py b/scripts/sync-tal.py index 89d2dddf..38bff3b0 100755 --- a/scripts/sync-tal.py +++ b/scripts/sync-tal.py @@ -121,6 +121,12 @@ def _har(k, ord_=False): if k is None: return '' return (ORD[k] if ord_ and k < len(ORD) else str(k)) print('udgivet: %s (%s vaerktoejer)' % (UDGIVET, K if K is not None else 'ukendt antal')) +# ⛔ 8/10 (panel R13-R14, fejl b): forbeholdet handler om VAERKTOEJER («The 32 tools described +# here are ... not published yet»). Har den udgivne version lige saa mange vaerktoejer som +# kilden (0.2.1 og 0.2.2 har begge 32), er saetningen falsk - og den ville staa live fra +# fletningen af 0.2.2 til npm har den. Forbeholdet skrives kun naar tallet er forskelligt +# eller ukendt. (Taeller vaerktoejer, ikke navne: i dag er navnene ens.) +VAERKTOEJS_AFSTAND = AFSTAND and (K is None or K != N) for f in sorted(x[len(ROD)+1:] for x in glob.glob(ROD+'/docs/docs/install-*/index.html')): p2 = os.path.join(ROD, f) @@ -132,9 +138,9 @@ def _har(k, ord_=False): MOENSTER = r'
\s*\n

What you get today.*?

\n?' har = re.search(MOENSTER, t2, flags=re.S) is not None ny, hvad = t2, None - if AFSTAND and har: + if VAERKTOEJS_AFSTAND and har: ny = re.sub(MOENSTER, FORBEHOLD.format(n=N, v=NUVAERENDE, u=UDGIVET, har=(', which has %d tools' % K) if K is not None else ', an earlier version'), t2, count=1, flags=re.S); hvad = 'genskrevet' - elif AFSTAND and not har: + elif VAERKTOEJS_AFSTAND and not har: ANKER = '

The whole thing, in three steps

' if ANKER in t2: # ⛔ Rundturen skal vaere IDENTISK. Foerste udgave lagde en tom @@ -154,7 +160,7 @@ def _har(k, ord_=False): ny = t2.replace(ANKER, FORBEHOLD.format(n=N, v=NUVAERENDE, u=UDGIVET, har=(', which has %d tools' % K) if K is not None else ', an earlier version') + ANKER, 1); hvad = 'sat ind igen' else: print(' ⚠ ingen plads til forbeholdet i', f, '- saet det ind i haanden') - elif not AFSTAND and har: + elif not VAERKTOEJS_AFSTAND and har: ny = re.sub(MOENSTER + r'\n?', '', t2, count=1, flags=re.S); hvad = 'FJERNET (udgivet == kilden)' if hvad and ny != t2: io.open(p2,'w',encoding='utf-8').write(ny) @@ -249,7 +255,7 @@ def _forbehold(fil, udgivet, n): m3 = _re.search(r'(|# FORBEHOLD).*?(|# /FORBEHOLD)\n?', t3, flags=_re.S) if not m3: - if AFSTAND: print(' ⚠ forbeholdet mangler i', f, '- npx serverer stadig', UDGIVET) + if VAERKTOEJS_AFSTAND: print(' ⚠ forbeholdet mangler i', f, '- npx serverer stadig', UDGIVET) continue aaben, luk = m3.group(1), m3.group(2) # ⛔ Foerste udgave regnede i TEGN: start+len(aaben) til end-len(luk). @@ -258,7 +264,7 @@ def _forbehold(fil, udgivet, n): # genudfyldningen fyrede aldrig. Gruppernes egne positioner er # praecise; min hovedregning var det ikke. indhold = t3[m3.end(1):m3.start(2)].strip() - if AFSTAND: + if VAERKTOEJS_AFSTAND: # ⛔ Foerste udgave fyldte kun TOMME markoerer. Stod der allerede en # tekst, skete der intet - saa en rettet generator naaede ALDRIG ud, # og teksten frøs fast i den form den havde den dag den blev skrevet. @@ -288,7 +294,7 @@ def _forbehold(fil, udgivet, n): io.open(p3,'w',encoding='utf-8').write(ny3) print((' forbeholdet sat ind igen: ' if not indhold else ' forbeholdet skrevet om: ') + f) continue - if not AFSTAND: + if not VAERKTOEJS_AFSTAND: # ⛔ FUNDET I EN TOERKOERSEL 20/9: her stod en FJERNELSE, og den var # envejs - markoererne forsvandt sammen med teksten, saa der var # intet at finde naeste gang. En fejlet udgivelse ville dermed diff --git a/test/claims.mjs b/test/claims.mjs index 5b96e029..619fa8cc 100644 --- a/test/claims.mjs +++ b/test/claims.mjs @@ -2235,7 +2235,10 @@ esac // faktum: `ask` og `default` i samme saetningsled. /\bask\b[^.;\n|]{0,14}\bdefault\b/i, /default is deliberately not the permissive/i, // 25/9: gemini-extension.json lovede «a consent gate on every write». - /consent (gate )?on every write/i] : []), + /consent (gate )?on every write/i, + // 8/10 (panel R14): MCPB-manifestet sagde «ask = confirm each write»; README og + // koden: første skrivning spørger, ét ja dækker sessionen. + /confirm (each|every) write/i] : []), // ⛔ 25/9 (Astra): «terminals ask for consent on every single action» slap // forbi - moensteret kendte kun «every ... time». ...(termPrSession ? [/terminals?\b[^.]{0,60}\bevery (single )?(time|action)/i, @@ -2247,7 +2250,7 @@ esac .split('\n').filter(f => f && !f.startsWith('test/') && !f.startsWith('videos/') && f !== 'CHANGELOG.md' && !f.endsWith('package-lock.json')); // ⛔ KALIBRERING begge veje: vagten skal kende sit grundlag OG fange en plantet saetning. - const plantet = 'Password managers and terminals ask every single time. Nothing clicks until you say yes. Password managers and terminals ask for consent on every single action. readonly | ask (default) | allow'; + const plantet = 'Password managers and terminals ask every single time. Nothing clicks until you say yes. Password managers and terminals ask for consent on every single action. readonly | ask (default) | allow · ask = confirm each write'; const fanger = forbudt.filter(r => r.test(plantet)).length; if (!stdAllow || !termPrSession || flader.length < 20 || fanger < 3) { check('51. siderne lover det samtykke koden giver', false, diff --git a/test/plugin-manifest.mjs b/test/plugin-manifest.mjs index 933a8da2..e2abc518 100644 --- a/test/plugin-manifest.mjs +++ b/test/plugin-manifest.mjs @@ -28,6 +28,12 @@ const srv = plugin.mcpServers?.['computer-mcp']; check('serveren startes med npx laast til netop den version npm serverer', srv?.command === 'npx' && JSON.stringify(srv?.args) === JSON.stringify(['-y', `@agent360/computer-mcp@${V}`]), JSON.stringify(srv?.args)); +// 8/10 (panel R14, C4): fladerne viser plugin-vejen med de navne manifesterne faktisk har. +const MARKED = marked.name, INSTALL = `/plugin install ${indgang?.name}@${MARKED}`, TILFOEJ = '/plugin marketplace add Agent360dk/computerMCP'; +for (const f of ['README.md', 'mcp-server/README.md', 'docs/docs/install-claude-code/index.html', 'docs/llms-install.md']) { + const t = readFileSync(join(ROOT, f), 'utf8'); + check(`${f} viser plugin-vejen med manifesternes navne`, t.includes(TILFOEJ) && t.includes(INSTALL), INSTALL); +} const har = spawnSync('/bin/sh', ['-c', 'command -v claude'], { encoding: 'utf8' }).stdout.trim(); if (!har) { console.log('SPR. Claude Codes validator - `claude` findes ikke paa denne maskine (umaalt, ikke bestaaet)'); diff --git a/test/release-fejlmatrix.mjs b/test/release-fejlmatrix.mjs index cf0ce8c7..ee5ca454 100644 --- a/test/release-fejlmatrix.mjs +++ b/test/release-fejlmatrix.mjs @@ -97,7 +97,12 @@ check('S3 ...og scriptet paastaar ikke at udgivelsen ikke skete', !/udgivelsen s // S4: deprecate fejler -> reservelinjen kan koeres ordret (citeret, hele beskeden). const s4 = scenarie('deprecate-fejl', { npm: { deprecate: 'exit 1' } }); const linje = (s4.ud.match(/^\s+npm deprecate '.*$/m) || [''])[0].trim(); -check('S4 deprecate fejler: reservelinjen er citeret og bærer hele beskeden', /^npm deprecate '@agent360\/computer-mcp@<[\d.]+' 'Upgrade to [\d.]+: earlier versions could return an unredacted screenshot when redaction failed\.'$/.test(linje), linje.slice(0, 120)); +check('S4 deprecate fejler: reservelinjen er citeret og bærer hele beskeden', /^npm deprecate '@agent360\/computer-mcp@<0\.2\.1' 'Upgrade to [\d.]+: versions before 0\.2\.1 could return an unredacted screenshot when redaction failed\.'$/.test(linje), linje.slice(0, 120)); +// S6 (panel R13-R14, fejl a): advarslen rammer kun versionerne FOER 0.2.1 - aldrig « maerke paa origin, publish, deprecate, PR og register i den raekkefoelge. const s5 = scenarie('alt-groent'); diff --git a/test/sync-tal-versioner.mjs b/test/sync-tal-versioner.mjs index 0ce7959f..f19aa31e 100644 --- a/test/sync-tal-versioner.mjs +++ b/test/sync-tal-versioner.mjs @@ -70,6 +70,17 @@ try { check('ukendt version: forbeholdet staar, uden tal', /0\.0\.9/.test(fc) && /an earlier version/.test(fc)); check('ukendt version: intet «12 tools»', !/\b12 tools\b|\btwelve\b/.test(fc)); + // 3b (panel R13-R14, fejl b): den udgivne version har lige saa mange vaerktoejer som kilden + // (0.2.1 og 0.2.2 har begge 32). «The 32 tools described here are ... not published yet» + // ville vaere falsk - og staa live fra fletningen af 0.2.2 til npm har den. Et syntetisk + // maerke paa HEAD i klonen giver den udgivne version kildens vaerktoejer. + const SYN = '9.9.8'; + execFileSync('git', ['tag', '-f', 'v' + SYN, 'HEAD'], { cwd: K, stdio: 'pipe' }); + const g = koer(SYN); + const alleSider = g.forside + g.readme + g.llms + g.install; + check('samme vaerktoejstal som kilden: intet «not published yet» nogen steder', !/not published yet|currently serves/.test(alleSider), + (alleSider.match(/[^.\n]{0,60}(not published yet|currently serves)[^.\n]{0,40}/) || [''])[0]); + // 4. Udgivet == kilden: intet forbehold paa forsiden. const e = koer(pakke); check('udgivet == kilden: forbeholdet er vaek', !/currently serves|not published yet/.test(forbehold(e.forside) + forbehold(e.readme))); From 7cbc600559156b08fbca45c865f804e946926fba Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Thu, 8 Oct 2026 23:41:44 +0200 Subject: [PATCH 102/132] feat(ikon): lyd ved nye spoergsmaal er slaaet TIL som standard (Gustav 8/10) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gustav valgte anbefalingen «lyd til» («koer det hele»). LYD_STANDARD = true; README og CHANGELOG siger nu at hvert nyt spoergsmaal giver én lyd, og at den kan slaas fra i ikonets menu. ikon-lyd 9/12/12b foelger; mutant S3 vendt (standarden sat tilbage til fra -> roed). Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 8 ++++---- CHANGELOG.md | 6 +++--- README.md | 6 +++--- helper/Sources/cmcp-status/Lyd.swift | 6 +++--- mcp-server/README.md | 6 +++--- test/ikon-lyd.mjs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index ca30ea11..7f2e4f85 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1264,14 +1264,14 @@ ] }, { - "navn": "S3-lyd-til-uden-gustavs-valg", + "navn": "S3-lyd-fra-mod-gustavs-valg", "fil": "helper/Sources/cmcp-status/Lyd.swift", "proeve": "test/ikon-lyd.mjs", - "forventet": "9 standarden er tilvalg", + "forventet": "9 standarden er til", "par": [ [ - "let LYD_STANDARD = false", - "let LYD_STANDARD = true" + "let LYD_STANDARD = true", + "let LYD_STANDARD = false" ] ] }, diff --git a/CHANGELOG.md b/CHANGELOG.md index 134e6883..741f212f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,9 +20,9 @@ when it was asked and when it ended (`answered` if the answer was yes), the serv versions, whether the box is on, and how many agent sessions were running. Idle time is input activity, not proof that someone saw the question. (`test/tilstede.mjs`) -**A sound, if you want one.** Switch it on in the icon's menu: one sound per new -question - not again if the same question is sent twice, and not when it -expires. (`test/ikon-lyd.mjs`) +**A sound for each new question.** Each new question plays one sound - not again +if the same question is sent twice, and not when it expires. It can be switched +off in the icon's menu. (`test/ikon-lyd.mjs`) **A step during a screen loan waits for you.** If you are using the keyboard or mouse, the step now waits up to five seconds for a pause instead of telling the agent to call again; if you keep going, it is refused and nothing moves. diff --git a/README.md b/README.md index bfedbc62..8de3d9da 100644 --- a/README.md +++ b/README.md @@ -390,9 +390,9 @@ thing this product puts on your screen, and it never takes focus. - **No banners by default, and never a button in one.** A notification with an `Allow` button would be a second way to say yes - and an agent can click a notification. You can switch a plain banner on from the icon's own menu. -- **A sound, if you want one.** Switch it on in the icon's menu, and each new - question plays one sound - not again if the same question is sent twice, and - not when it expires. +- **A sound for each new question.** Each new question plays one sound; switch it off in the icon's menu. + It does not play again if the same question is sent twice, and not when it + expires. - **The icon cannot be touched by an agent.** Any write tool aimed at it is refused in every mode, before the gate can even ask. Measured: without that rule, three of three presses reached the helper. diff --git a/helper/Sources/cmcp-status/Lyd.swift b/helper/Sources/cmcp-status/Lyd.swift index 5d765e63..a6f73457 100644 --- a/helper/Sources/cmcp-status/Lyd.swift +++ b/helper/Sources/cmcp-status/Lyd.swift @@ -10,9 +10,9 @@ import Foundation // spoergsmaal igen paa en ny forbindelse). Afgjort her, ét sted, saa test/ikon-lyd.mjs // kompilerer og maaler den samme regel ikonet bruger - uden at starte ikonet. // -// ⏳ Standarden er Gustavs valg (Opus: til, hans egen WISHLIST-tekst · Astra: tilvalg). -// Indtil han har valgt: tilvalg - intet nyt bliver standard uden hans ja. -let LYD_STANDARD = false +// Standarden var Gustavs valg (Opus: til, hans egen WISHLIST-tekst · Astra: tilvalg). +// Gustav 8/10 («kør det hele» på anbefalingen «lyd til»): TIL. Kan slås fra i menuen. +let LYD_STANDARD = true func lydSlaaetTil() -> Bool { (UserDefaults.standard.object(forKey: "lyd") as? Bool) ?? LYD_STANDARD diff --git a/mcp-server/README.md b/mcp-server/README.md index bf3bc8a9..f105c911 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -388,9 +388,9 @@ thing this product puts on your screen, and it never takes focus. - **No banners by default, and never a button in one.** A notification with an `Allow` button would be a second way to say yes - and an agent can click a notification. You can switch a plain banner on from the icon's own menu. -- **A sound, if you want one.** Switch it on in the icon's menu, and each new - question plays one sound - not again if the same question is sent twice, and - not when it expires. +- **A sound for each new question.** Each new question plays one sound; switch it off in the icon's menu. + It does not play again if the same question is sent twice, and not when it + expires. - **The icon cannot be touched by an agent.** Any write tool aimed at it is refused in every mode, before the gate can even ask. Measured: without that rule, three of three presses reached the helper. diff --git a/test/ikon-lyd.mjs b/test/ikon-lyd.mjs index 6bcbb34d..a942aa17 100644 --- a/test/ikon-lyd.mjs +++ b/test/ikon-lyd.mjs @@ -43,9 +43,9 @@ FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ["ly check('7 en lyd der ikke blev spillet (slaaet fra), taeller ikke som hoert', r[6] === true); check('8 hoejst én lyd pr. spoergsmaal over hele forloebet', r.filter(Boolean).length === 3, `${r.filter(Boolean).length} lyde for a, b, d`); - // Standarden er Gustavs valg (R9). Indtil han har valgt: tilvalg. + // Standarden var Gustavs valg (R9). Gustav 8/10: til. const { standard } = koer([]); - check('9 standarden er tilvalg, indtil Gustav har valgt', standard === false, String(standard)); + check('9 standarden er til (Gustav 8/10)', standard === true, String(standard)); // Ikonet bruger reglen: den eneste lyd staar under skalLyde, og menuen kan slaa den fra. const main = readFileSync(join(KILDE, 'main.swift'), 'utf8'); From f5066ef3ed57274f967e6b5a801eb815de9389cf Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 08:07:34 +0200 Subject: [PATCH 103/132] =?UTF-8?q?fix(navne):=20app=20"WhatsApp"=20finder?= =?UTF-8?q?=20=C2=AB=E2=80=8EWhatsApp=C2=BB=20-=20i=20porten=20og=20i=20le?= =?UTF-8?q?veringen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WhatsApp ligger som /Applications/‎WhatsApp.app og hedder «‎WhatsApp» naar den koerer (U+200E i CFBundleDisplayName). computer_launch {app:"WhatsApp"} blev «ukendt maal» og afvist i baggrunden, og ethvert skrivende kald i en koerende WhatsApp ligesaa. Maalt 9/10 under F1 paa Gustavs Mac. Én regel paa to sprog - serverens findProgram (helper.js) og hjaelperens Navne.vaelg (Navne.swift): bundle-id/praecist navn vinder som foer; ellers navnet uden Unicode Cf-tegn, kun naar praecis ét program passer (ellers afvist). Bruges af resolveBundleId, resolveApp, AX.app og programURL. test/usynlige-navne.mjs: samme tabel gennem begge sider (9+9+1), kaldestederne bundet (4 tjek), attrap med Gustavs Macs svar (2), den rigtige hjaelper (1). Mutanter U1-U8 alle roede; 130 ankre entydige. I run-all.sh og ci.yml. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 96 +++++++++++++++++ .github/workflows/ci.yml | 5 + CHANGELOG.md | 7 ++ .../Sources/cmcp-helper/Accessibility.swift | 22 +++- helper/Sources/cmcp-helper/Navne.swift | 33 ++++++ mcp-server/helper.js | 33 ++++-- test/run-all.sh | 2 + test/usynlige-navne.mjs | 100 ++++++++++++++++++ 8 files changed, 287 insertions(+), 11 deletions(-) create mode 100644 helper/Sources/cmcp-helper/Navne.swift create mode 100644 test/usynlige-navne.mjs diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 7f2e4f85..e3e8dabb 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1478,5 +1478,101 @@ "/plugin install computer-mcp" ] ] + }, + { + "navn": "U1-usynlige-tegn-taeller-med-i-serveren", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const USYNLIGE = /\\p{Cf}/gu;", + "const USYNLIGE = /(?!)/gu;" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1.1 serveren" + }, + { + "navn": "U2-serveren-vaelger-ved-tvivl", + "fil": "mcp-server/helper.js", + "par": [ + [ + "return hits.length === 1 ? hits[0] : null;", + "return hits[0] || null;" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1.2 serveren" + }, + { + "navn": "U3-usynlige-tegn-taeller-med-i-hjaelperen", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "$0.properties.generalCategory != .format", + "_ = $0; return true" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2.1 hjaelperen" + }, + { + "navn": "U4-hjaelperen-vaelger-ved-tvivl", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "return hits.count == 1 ? hits[0] : nil", + "return hits.first" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2.2 hjaelperen" + }, + { + "navn": "U5-koerende-program-uden-reglen", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + "guard let i = Navne.vaelg(alle.map { $0.localizedName ?? \"\" }, bundleId) else { return nil }", + "guard let i = alle.firstIndex(where: { $0.localizedName?.lowercased() == bundleId.lowercased() }) else { return nil }" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6a" + }, + { + "navn": "U6-lukket-program-uden-reglen", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + "guard let i = Navne.vaelg(fund.map { $0.deletingPathExtension().lastPathComponent }, hvad) else { return nil }", + "guard let i = fund.firstIndex(where: { $0.deletingPathExtension().lastPathComponent == hvad }) else { return nil }" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6b" + }, + { + "navn": "U7-porten-uden-reglen", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const hit = findProgram(r.apps || [], want);\n return hit ? (hit.bundleId || null) : null;", + "const hit = (r.apps || []).find(a => [a.bundleId, a.name].some(v => (v || '').toLowerCase() === want.toLowerCase()));\n return hit ? (hit.bundleId || null) : null;" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "4 resolveBundleId" + }, + { + "navn": "U8-forrest-opslaget-uden-reglen", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const hit = findProgram(r.apps || [], want);\n return hit ? { bundleId", + "const hit = (r.apps || []).find(a => [a.bundleId, a.name].some(v => (v || '').toLowerCase() === want.toLowerCase()));\n return hit ? { bundleId" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "5 resolveApp" } ] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3669860..e42efd29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,6 +76,11 @@ jobs: - name: Ikonets lyd-regel run: node test/ikon-lyd.mjs + # 9/10: WhatsApp hedder «\u200eWhatsApp». Serverens og hjaelperens navneregel + # koeres mod samme tabel; Navne.swift kompileres for sig. + - name: Usynlige tegn i programnavne + run: node test/usynlige-navne.mjs + # 7/10 (panel R12, Opus): pluginnet skal pege paa PUBLICERET - den version npm # serverer. Flettes en gren uden at sync-tal.py har koert efter en udgivelse, # bliver main roed her, og release.sh nægter at udgive. diff --git a/CHANGELOG.md b/CHANGELOG.md index 741f212f..e6dc85bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,13 @@ time is input activity, not proof that someone saw the question. **A sound for each new question.** Each new question plays one sound - not again if the same question is sent twice, and not when it expires. It can be switched off in the icon's menu. (`test/ikon-lyd.mjs`) +**WhatsApp by its name.** WhatsApp's name starts with an invisible character +(U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: +starting it in the background was refused as an unknown app, and so was every +action in it. Names are now compared without invisible formatting characters, +on the server and in the helper alike - an exact name still wins, and if more +than one app fits, none is chosen and the action is refused. +(`test/usynlige-navne.mjs`) **A step during a screen loan waits for you.** If you are using the keyboard or mouse, the step now waits up to five seconds for a pause instead of telling the agent to call again; if you keep going, it is refused and nothing moves. diff --git a/helper/Sources/cmcp-helper/Accessibility.swift b/helper/Sources/cmcp-helper/Accessibility.swift index d03c665d..e22d84c1 100644 --- a/helper/Sources/cmcp-helper/Accessibility.swift +++ b/helper/Sources/cmcp-helper/Accessibility.swift @@ -163,8 +163,11 @@ enum AX { /// faldt allerede tilbage paa `allApps()`, saa porten kunne i forvejen /// navngive et menulinje-program. Det var kun DE SEKS veje der ikke kunne. static func app(bundleId: String) -> NSRunningApplication? { - allApps().first { $0.bundleIdentifier == bundleId } - ?? allApps().first { $0.localizedName?.lowercased() == bundleId.lowercased() } + let alle = allApps() + if let a = alle.first(where: { $0.bundleIdentifier == bundleId }) { return a } + // Navnet: samme regel som serverens opslag (Navne.swift) - ogsaa «\u{200E}WhatsApp». + guard let i = Navne.vaelg(alle.map { $0.localizedName ?? "" }, bundleId) else { return nil } + return alle[i] } /// ⛔ ARKET DER STOPPER EN UBEVOGTET KOERSEL (22/9-2026) @@ -1412,11 +1415,22 @@ extension AX { if hvad.contains("/") || hvad.hasPrefix(".") { return nil } // Ogsaa et almindeligt navn skal virke: mennesket siger "Notes", // ikke "com.apple.Notes". - for m in ["/Applications", "/System/Applications", NSHomeDirectory() + "/Applications"] { + let mapper = ["/Applications", "/System/Applications", NSHomeDirectory() + "/Applications"] + for m in mapper { let k = URL(fileURLWithPath: m).appendingPathComponent(hvad + ".app") if FileManager.default.fileExists(atPath: k.path) { return k } } - return nil + // ⛔ 9/10: «/Applications/\u{200E}WhatsApp.app» - et usynligt tegn i filnavnet. + // Samme regel som navnet paa et koerende program (Navne.swift), kun i de + // samme tre mapper, og kun naar praecis ét program passer. + var fund: [URL] = [] + for m in mapper { + for f in (try? FileManager.default.contentsOfDirectory(atPath: m)) ?? [] where f.hasSuffix(".app") { + fund.append(URL(fileURLWithPath: m).appendingPathComponent(f)) + } + } + guard let i = Navne.vaelg(fund.map { $0.deletingPathExtension().lastPathComponent }, hvad) else { return nil } + return fund[i] } /// ⛔ FABLE 24/9: `computer_launch` af et LUKKET program blev afvist i diff --git a/helper/Sources/cmcp-helper/Navne.swift b/helper/Sources/cmcp-helper/Navne.swift new file mode 100644 index 00000000..a55976a3 --- /dev/null +++ b/helper/Sources/cmcp-helper/Navne.swift @@ -0,0 +1,33 @@ +import Foundation + +/// ⛔ 9/10 (F1 paa Gustavs Mac): WhatsApp hedder «\u{200E}WhatsApp» - et usynligt +/// venstre-mod-hoejre-maerke (U+200E) foran navnet, baade i filnavnet +/// (/Applications/\u{200E}WhatsApp.app) og i CFBundleDisplayName. `--app WhatsApp` +/// fandt derfor intet: opstarten blev «ukendt maal» og afvist i baggrunden, og +/// hvert skrivende kald i en koerende WhatsApp ligesaa. Et menneske ser «WhatsApp»; +/// det goer opslaget nu ogsaa. +/// +/// Reglen er den SAMME som serverens `findProgram` i helper.js - porten og +/// leveringen skal ramme samme program (18/9). test/usynlige-navne.mjs koerer +/// begge sider mod de samme tilfaelde: +/// 1. et praecist navn (store/smaa bogstaver ligegyldige) vinder, som foer +/// 2. ellers navnet uden usynlige formateringstegn (Unicode Cf) - men kun naar +/// praecis ét program passer. Passer flere, vaelges intet, og et ukendt maal +/// afvises. +enum Navne { + static func noegle(_ s: String) -> String { + var v = String.UnicodeScalarView() + v.append(contentsOf: s.unicodeScalars.filter { $0.properties.generalCategory != .format }) + return String(v).trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + } + + /// Hvilket af `navne` mener `want`? nil = intet entydigt. + static func vaelg(_ navne: [String], _ want: String) -> Int? { + let lav = want.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + if let i = navne.firstIndex(where: { $0.lowercased() == lav }) { return i } + let n = noegle(want) + guard !n.isEmpty else { return nil } + let hits = navne.indices.filter { noegle(navne[$0]) == n } + return hits.count == 1 ? hits[0] : nil + } +} diff --git a/mcp-server/helper.js b/mcp-server/helper.js index 8ed78f12..ab8e72b7 100644 --- a/mcp-server/helper.js +++ b/mcp-server/helper.js @@ -134,6 +134,30 @@ export function callHelper(args, { timeout = 30000, stdin = null } = {}) { }); } +/// ⛔ 9/10 (F1 paa Gustavs Mac): WhatsApp hedder «\u200eWhatsApp» - et usynligt +/// venstre-mod-hoejre-maerke (U+200E) foran navnet, baade paa disken og i +/// CFBundleDisplayName. `app: "WhatsApp"` fandt derfor intet, maalet blev +/// «ukendt», og hvert skrivende kald i WhatsApp blev afvist i baggrunden. +/// +/// Samme regel som hjaelperens `Navne.vaelg` (Navne.swift), saa porten og +/// leveringen rammer samme program (18/9) - test/usynlige-navne.mjs koerer +/// begge sider mod de samme tilfaelde: +/// 1. bundle-id, saa et praecist navn (store/smaa bogstaver ligegyldige), som foer +/// 2. ellers navnet uden usynlige formateringstegn (Unicode Cf) - men kun naar +/// praecis ét program passer. Passer flere, vaelges intet: et ukendt maal afvises. +const USYNLIGE = /\p{Cf}/gu; +export const navneNoegle = (s) => String(s ?? '').replace(USYNLIGE, '').trim().toLowerCase(); +export function findProgram(apps, want) { + const lower = String(want ?? '').trim().toLowerCase(); + const hit = apps.find(a => (a.bundleId || '').toLowerCase() === lower) + || apps.find(a => (a.name || '').toLowerCase() === lower); + if (hit) return hit; + const n = navneNoegle(want); + if (!n) return null; + const hits = apps.filter(a => navneNoegle(a.name) === n); + return hits.length === 1 ? hits[0] : null; +} + /// Oversaetter det program-argument agenten skrev, til et kanonisk bundle-ID. /// /// ⛔ Findes fordi porten ellers kan omgaas med ét ord. `ALWAYS_ASK_APPS` @@ -175,10 +199,7 @@ export async function resolveBundleId(appArg) { // under load 143, og en timeout maa ikke blive til et tavst ja. try { const r = await callHelper(['apps', '--all'], { timeout: 15000 }); // samme maengde som leveringen - const apps = r.apps || []; - const lower = want.toLowerCase(); - const hit = apps.find(a => (a.bundleId || '').toLowerCase() === lower) - || apps.find(a => (a.name || '').toLowerCase() === lower); + const hit = findProgram(r.apps || [], want); return hit ? (hit.bundleId || null) : null; } catch { return null; @@ -201,9 +222,7 @@ export async function resolveApp(appArg) { if (!want) return null; try { const r = await callHelper(['apps', '--all'], { timeout: 15000 }); // samme maengde som leveringen - const lower = want.toLowerCase(); - const hit = (r.apps || []).find(a => (a.bundleId || '').toLowerCase() === lower) - || (r.apps || []).find(a => (a.name || '').toLowerCase() === lower); + const hit = findProgram(r.apps || [], want); return hit ? { bundleId: hit.bundleId || null, active: !!hit.active, name: hit.name } : null; } catch { return null; diff --git a/test/run-all.sh b/test/run-all.sh index 0e9cc975..ddf7f8de 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -154,6 +154,8 @@ run "samtykke-tekst" "node test/samtykke-tekst.mjs" # ⛔ 29/9: Touch ID-arket klippede handlingen ved 80 tegn, tavst - et ja til noget ulaest. run "hele teksten i menuen" "node test/ombryd.mjs" run "lyd pr. spoergsmaal" "node test/ikon-lyd.mjs" +# ⛔ 9/10: «\u200eWhatsApp» - app "WhatsApp" blev «ukendt maal» og afvist. +run "usynlige navne" "node test/usynlige-navne.mjs" # ⛔ 29/9: goer-selv, skaerm-laanet og den fulde tekst var kun kompileret i ikonet, aldrig koert. run "ikonets menu" "node test/ikon-menu.mjs" # ⛔ 29/9: Send i WhatsApp gik igennem i allow uden at nogen blev spurgt. diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs new file mode 100644 index 00000000..dc9fafd3 --- /dev/null +++ b/test/usynlige-navne.mjs @@ -0,0 +1,100 @@ +// USYNLIGE NAVNE: «WhatsApp» skal finde «‎WhatsApp» - i porten OG i leveringen. +// +// ⛔ 9/10 (F1 paa Gustavs Mac): WhatsApp ligger som /Applications/‎WhatsApp.app og +// hedder «‎WhatsApp» naar den koerer (CFBundleDisplayName). `computer_launch +// {app:"WhatsApp", background:true}` blev «ukendt maal» og afvist, og ethvert skrivende +// kald i en koerende WhatsApp ligesaa. Rettelsen er ÉN regel paa to sprog: serverens +// findProgram (helper.js) og hjaelperens Navne.vaelg (Navne.swift). Proeven koerer +// begge mod SAMME tabel, saa de ikke kan glide fra hinanden - porten skal vurdere det +// program leveringen rammer (18/9). +// +// Ingen skaerm, intet program startes. Kun paa en Mac med WhatsApp maales den rigtige +// hjaelper ogsaa (punkt 9); ellers siges det. +import './ryd-op.mjs'; +import { execFileSync } from 'node:child_process'; +import { mkdtempSync, writeFileSync, readFileSync, existsSync, readdirSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { lavFalskHjaelper } from './falsk-hjaelper.mjs'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const KILDE = join(ROOT, 'helper', 'Sources', 'cmcp-helper'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +const LRM = '‎', RLM = '‏', ZWSP = '​'; +// [navne, hvad agenten skriver, forventet indeks (null = intet entydigt), hvad tilfaeldet maaler] +const TABEL = [ + [['Finder', `${LRM}WhatsApp`], 'WhatsApp', 1, 'usynligt tegn foran navnet'], + [[`${LRM}WhatsApp`, `WhatsApp${RLM}`], 'WhatsApp', null, 'to passer uden de usynlige tegn: intet vaelges'], + [['WhatsApp', `${LRM}WhatsApp`], 'WhatsApp', 0, 'et praecist navn vinder over et der kun passer uden usynlige tegn'], + [[`${LRM}WhatsApp`], LRM, null, 'kun usynlige tegn finder intet'], + [[`${LRM}WhatsApp`], 'WhatsAp', null, 'et andet navn finder intet'], + [['Notes'], 'notes', 0, 'store/smaa bogstaver som foer'], + [[`${LRM}WhatsApp`], `${LRM}WhatsApp`, 0, 'navnet kopieret ordret fra computer_apps'], + [[`Whats${ZWSP}App`], 'whatsapp', 0, 'usynligt tegn inde i navnet'], + [['Notes', 'Noter'], 'Note', null, 'et forkortet navn finder intet'], +]; + +// 1-2 · serverens regel +const { findProgram } = await import(join(ROOT, 'mcp-server', 'helper.js')); +const jsSvar = TABEL.map(([navne, want]) => { + const apps = navne.map((name, i) => ({ name, bundleId: `dk.proeve.${i}` })); + const hit = findProgram(apps, want); + return hit ? apps.indexOf(hit) : null; +}); +TABEL.forEach(([, , forventet, hvad], i) => + check(`1.${i + 1} serveren: ${hvad}`, jsSvar[i] === forventet, `fik ${jsSvar[i]}, ventede ${forventet}`)); + +// 2 · hjaelperens regel: Navne.swift kompileret for sig, samme tabel +const ARB = mkdtempSync(join(tmpdir(), 'cmcp-usynlige-navne-')); +writeFileSync(join(ARB, 'main.swift'), `import Foundation +struct T: Decodable { let navne: [String]; let want: String } +let ind = try! JSONDecoder().decode([T].self, from: FileHandle.standardInput.readDataToEndOfFile()) +let ud: [Any] = ind.map { t in Navne.vaelg(t.navne, t.want).map { $0 as Any } ?? NSNull() } +FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) +`); +const BIN = join(ARB, 'navne'); +execFileSync('swiftc', [join(KILDE, 'Navne.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 180000 }); +const swiftSvar = JSON.parse(execFileSync(BIN, { input: JSON.stringify(TABEL.map(([navne, want]) => ({ navne, want }))), encoding: 'utf8' })); +TABEL.forEach(([, , forventet, hvad], i) => + check(`2.${i + 1} hjaelperen: ${hvad}`, swiftSvar[i] === forventet, `fik ${swiftSvar[i]}, ventede ${forventet}`)); +check('3 serveren og hjaelperen svarer ens paa hele tabellen', JSON.stringify(jsSvar) === JSON.stringify(swiftSvar), + `server ${JSON.stringify(jsSvar)} · hjaelper ${JSON.stringify(swiftSvar)}`); + +// 4-6 · reglen er den der BRUGES: begge serveropslag og begge hjaelperopslag kalder den +const helperJs = readFileSync(join(ROOT, 'mcp-server', 'helper.js'), 'utf8'); +const krop = (src, start) => { const i = src.indexOf(start); return i < 0 ? '' : src.slice(i, src.indexOf('\n}', i)); }; +check('4 resolveBundleId (porten) bruger findProgram', /findProgram\(/.test(krop(helperJs, 'export async function resolveBundleId('))); +check('5 resolveApp (hvem er forrest) bruger findProgram', /findProgram\(/.test(krop(helperJs, 'export async function resolveApp('))); +const ax = readFileSync(join(KILDE, 'Accessibility.swift'), 'utf8'); +const swiftKrop = (start) => { const i = ax.indexOf(start); return i < 0 ? '' : ax.slice(i, ax.indexOf('\n }\n', i)); }; +check('6a et koerende program slaas op med Navne.vaelg (AX.app)', /Navne\.vaelg\(/.test(swiftKrop('static func app(bundleId: String)'))); +check('6b et lukket program paa disken slaas op med Navne.vaelg (programURL)', /Navne\.vaelg\(/.test(swiftKrop('static func programURL('))); + +// 7-8 · gennem serverens rigtige opslag, med en attrap der svarer som Gustavs Mac +const h = lavFalskHjaelper('cmcp-usynlige'); +process.env.CMCP_HELPER = h.sti; +const { resolveBundleId, resolveApp } = await import(join(ROOT, 'mcp-server', 'helper.js')); +h.saetSvar({ apps: { apps: [ + { name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: false }, + { name: `${LRM}WhatsApp`, bundleId: 'net.whatsapp.WhatsApp', pid: 3303, active: false }, +] } }); +const bid = await resolveBundleId('WhatsApp'); +check('7 porten ser net.whatsapp.WhatsApp for app "WhatsApp"', bid === 'net.whatsapp.WhatsApp', String(bid)); +const ra = await resolveApp('WhatsApp'); +check('8 resolveApp ser samme program', ra?.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(ra)); + +// 9 · den rigtige hjaelper paa en Mac hvor WhatsApp ligger med det usynlige tegn +const harWhatsApp = ['/Applications'].some(m => { try { return readdirSync(m).includes(`${LRM}WhatsApp.app`); } catch { return false; } }); +const hjaelper = [join(ROOT, 'helper', '.build', 'release', 'cmcp-helper'), join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper')].find(p => existsSync(p)); +if (harWhatsApp && hjaelper) { + let r; try { r = JSON.parse(execFileSync(hjaelper, ['resolve-app', '--app', 'WhatsApp'], { encoding: 'utf8', timeout: 15000 })); } catch (e) { r = { fejl: String(e.stdout || e.message).slice(0, 200) }; } + check(`9 den rigtige hjaelper finder /Applications/${LRM}WhatsApp.app ud fra "WhatsApp"`, r.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(r)); +} else { + console.log(`SPR. 9 den rigtige hjaelper - ${harWhatsApp ? 'ingen bygget hjaelper' : 'WhatsApp ligger ikke med det usynlige tegn paa denne Mac'}`); +} + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); From c3bb3306e6c187700e5e8dff6db577e7c7b11ebe Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 08:15:13 +0200 Subject: [PATCH 104/132] =?UTF-8?q?fix(navne):=20hjaelperen=20oversaetter?= =?UTF-8?q?=20--app=20=C3=A9t=20sted=20-=20find,=20vinduer=20og=20skaermbi?= =?UTF-8?q?lleder=20rammer=20ogsaa=20=C2=AB=E2=80=8EWhatsApp=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit f5066ef rettede AX.app og programURL, men hjaelperen sammenlignede --app med programnavne paa ca. tyve andre steder hver for sig. MAALT 9/10 med WhatsApp koerende: `find --app WhatsApp` 0 fund, `windows --app WhatsApp` 0 vinduer - med id'et 3 og 1. Nu oversaetter main.swift et navn ÉN gang, foer Args bygges, til det bundle-id Navne-reglen vaelger blandt de koerende programmer. test/usynlige-navne.mjs: 6c binder oversaettelsen; 10a/10b maaler den rigtige hjaelper (roede foer ombygning: 0/1 og 0/3; groenne efter: 1/1 og 3/3). Mutant U9 roed. 131 ankre entydige. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ helper/Sources/cmcp-helper/main.swift | 16 +++++++++++++++- test/usynlige-navne.mjs | 13 +++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index e3e8dabb..7e65085a 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1574,5 +1574,17 @@ ], "proeve": "test/usynlige-navne.mjs", "forventet": "5 resolveApp" + }, + { + "navn": "U9-hjaelperen-oversaetter-ikke-app", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + "let args = Args(oversaetApp(CommandLine.arguments))", + "let args = Args(CommandLine.arguments)" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6c" } ] diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index c850f0d0..1a2b70a7 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -24,7 +24,21 @@ func modtager(_ args: Args) -> pid_t? { let HELPER_VERSION = "0.2.2" -let args = Args(CommandLine.arguments) +/// ⛔ 9/10 (F1 paa Gustavs Mac): `--app` blev sammenlignet med programnavne paa +/// tyve steder hver for sig (find, vinduer, skaermbilleder, sloering, levering). +/// «\u{200E}WhatsApp» passede ingen af dem, saa `find --app WhatsApp` fandt intet. +/// Nu oversaettes et navn ÉN gang, her, til det bundle-id Navne-reglen vaelger +/// blandt de koerende programmer - samme program som serverens port vurderede. +/// Koerer programmet ikke, eller passer flere, staar argumentet uroert. +func oversaetApp(_ argv: [String]) -> [String] { + var a = argv + for i in a.indices.dropLast() where a[i] == "--app" && !a[i + 1].hasPrefix("--") { + if let bid = AX.app(bundleId: a[i + 1])?.bundleIdentifier { a[i + 1] = bid } + } + return a +} + +let args = Args(oversaetApp(CommandLine.arguments)) // ⛔ FUNDET AF SIKKERHEDSREVIEWET 20/9. `contains` og `title` gik som // ARGUMENTER, og `ps` viser hele kommandolinjen for enhver proces med samme diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index dc9fafd3..0951fac5 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -72,6 +72,10 @@ const ax = readFileSync(join(KILDE, 'Accessibility.swift'), 'utf8'); const swiftKrop = (start) => { const i = ax.indexOf(start); return i < 0 ? '' : ax.slice(i, ax.indexOf('\n }\n', i)); }; check('6a et koerende program slaas op med Navne.vaelg (AX.app)', /Navne\.vaelg\(/.test(swiftKrop('static func app(bundleId: String)'))); check('6b et lukket program paa disken slaas op med Navne.vaelg (programURL)', /Navne\.vaelg\(/.test(swiftKrop('static func programURL('))); +const mainSwift = readFileSync(join(KILDE, 'main.swift'), 'utf8'); +check('6c hjaelperen oversaetter --app ét sted, foer alle kommandoer (Args bygges af oversaetApp)', + /^let args = Args\(oversaetApp\(CommandLine\.arguments\)\)/m.test(mainSwift) + && /AX\.app\(bundleId:/.test(mainSwift.slice(mainSwift.indexOf('func oversaetApp('), mainSwift.indexOf('let args = Args(')))); // 7-8 · gennem serverens rigtige opslag, med en attrap der svarer som Gustavs Mac const h = lavFalskHjaelper('cmcp-usynlige'); @@ -92,6 +96,15 @@ const hjaelper = [join(ROOT, 'helper', '.build', 'release', 'cmcp-helper'), join if (harWhatsApp && hjaelper) { let r; try { r = JSON.parse(execFileSync(hjaelper, ['resolve-app', '--app', 'WhatsApp'], { encoding: 'utf8', timeout: 15000 })); } catch (e) { r = { fejl: String(e.stdout || e.message).slice(0, 200) }; } check(`9 den rigtige hjaelper finder /Applications/${LRM}WhatsApp.app ud fra "WhatsApp"`, r.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(r)); + // 10 · koerer WhatsApp, skal find og vinduer med navnet ramme det samme som med id'et + const koerer = (() => { try { return JSON.parse(execFileSync(hjaelper, ['apps'], { encoding: 'utf8', timeout: 15000 })).apps.some(x => x.bundleId === 'net.whatsapp.WhatsApp'); } catch { return false; } })(); + if (koerer) { + const j = (a) => { try { return JSON.parse(execFileSync(hjaelper, a, { encoding: 'utf8', timeout: 15000 })); } catch (e) { return { fejl: String(e.stdout || e.message).slice(0, 160) }; } }; + const vn = j(['windows', '--app', 'WhatsApp']), vi = j(['windows', '--app', 'net.whatsapp.WhatsApp']); + check('10a windows --app WhatsApp = samme vinduer som med id', vn.count >= 1 && vn.count === vi.count, `navn ${vn.count} · id ${vi.count}`); + const fn = j(['find', '--app', 'WhatsApp', '--role', 'AXButton', '--limit', '3']), fi = j(['find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton', '--limit', '3']); + check('10b find --app WhatsApp = samme fund som med id', fn.count >= 1 && fn.count === fi.count, `navn ${fn.count} · id ${fi.count}`); + } else console.log('SPR. 10 WhatsApp koerer ikke - find og vinduer med navnet er ikke maalt'); } else { console.log(`SPR. 9 den rigtige hjaelper - ${harWhatsApp ? 'ingen bygget hjaelper' : 'WhatsApp ligger ikke med det usynlige tegn paa denne Mac'}`); } From 269f9cac2ea34120e8e84d3a15424e92dd208206 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 10:24:32 +0200 Subject: [PATCH 105/132] fix(navne): R16 - porten og hjaelperen bruger tegn for tegn samme navneregel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Astra (IKKE GODKENDT) og Opus (rettelser) MAALTE at f5066ef/c3bb330 kunne lade porten og leveringen vaelge forskellige programmer: Swifts trim fjerner U+0085 og U+200B men ikke U+FEFF, `lowercased()` paa hele strengen og Swifts kanoniske `==` (é = e+U+0301) - JS goer det modsatte. «Computer MCP\u0085» var ukendt for porten og menulinje-ikonet for hjaelperen. - Navne.swift: JS' trim-maengde ordret, smaa bogstaver tegn for tegn, sammenligning paa tegn; bundle-id praecist, saa uden store/smaa (som findProgram); tvetydig er sit eget svar, og opstarten falder ikke til disken. - Hjaelperen slaar navne op ét sted (Navne.oversaet ved indgangen, AX.appOpslag); alle filtre sammenligner kun id - leveringens og vinduernes navne-reserve er vaek. Undtagelse: adgangskode-tjekket i skaermbilledet, som kun kan afvise. - helper.js findProgram: samme trin, smaa bogstaver tegn for tegn. - test/usynlige-navne.mjs: 18+6 tabelraekker gennem begge sider, trim/Cf/smaa sammenlignet for HVERT Unicode-tegn (25/170/1488 ens), kaldestederne bundet med praecise udtryk, den rigtige hjaelper paa Finder (ogsaa paa CI) og «Finder\u0085» -> intet. 70/70. - Mutanter U1-U22: alle roede (inkl. konsulenternes overlevende A1/A2, A13, A14, M1-M6). 144 ankre entydige. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 174 +++++++++++++++- .../Sources/cmcp-helper/Accessibility.swift | 35 ++-- helper/Sources/cmcp-helper/Capture.swift | 10 +- helper/Sources/cmcp-helper/Navne.swift | 73 +++++-- helper/Sources/cmcp-helper/main.swift | 20 +- mcp-server/helper.js | 18 +- test/usynlige-navne.mjs | 187 +++++++++++++----- 7 files changed, 410 insertions(+), 107 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 7e65085a..d8f4ac43 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1520,8 +1520,8 @@ "fil": "helper/Sources/cmcp-helper/Navne.swift", "par": [ [ - "return hits.count == 1 ? hits[0] : nil", - "return hits.first" + "return hits.count == 1 ? .fundet(hits[0]) : (hits.isEmpty ? .intet : .tvetydig)", + "return hits.isEmpty ? .intet : .fundet(hits[0])" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1532,20 +1532,20 @@ "fil": "helper/Sources/cmcp-helper/Accessibility.swift", "par": [ [ - "guard let i = Navne.vaelg(alle.map { $0.localizedName ?? \"\" }, bundleId) else { return nil }", - "guard let i = alle.firstIndex(where: { $0.localizedName?.lowercased() == bundleId.lowercased() }) else { return nil }" + "static func app(bundleId: String) -> NSRunningApplication? { appOpslag(bundleId).app }", + "static func app(bundleId: String) -> NSRunningApplication? { allApps().first { $0.bundleIdentifier == bundleId } ?? appOpslag(bundleId).app }" ] ], "proeve": "test/usynlige-navne.mjs", - "forventet": "6a" + "forventet": "6a AX.app" }, { - "navn": "U6-lukket-program-uden-reglen", + "navn": "U6-lukket-program-forkert-valg", "fil": "helper/Sources/cmcp-helper/Accessibility.swift", "par": [ [ - "guard let i = Navne.vaelg(fund.map { $0.deletingPathExtension().lastPathComponent }, hvad) else { return nil }", - "guard let i = fund.firstIndex(where: { $0.deletingPathExtension().lastPathComponent == hvad }) else { return nil }" + "else { return nil }\n return fund[i]", + "else { return nil }\n return fund.first" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1580,11 +1580,167 @@ "fil": "helper/Sources/cmcp-helper/main.swift", "par": [ [ - "let args = Args(oversaetApp(CommandLine.arguments))", + "let args = Args(Navne.oversaet(CommandLine.arguments) { AX.app(bundleId: $0)?.bundleIdentifier })", "let args = Args(CommandLine.arguments)" ] ], "proeve": "test/usynlige-navne.mjs", "forventet": "6c" + }, + { + "navn": "U10-trim-tager-NEL", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "[0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20, 0xA0, 0x1680]", + "[0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20, 0x85, 0xA0, 0x1680]" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "3a trim" + }, + { + "navn": "U11-trim-glemmer-BOM", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "0x205F, 0x3000, 0xFEFF])", + "0x205F, 0x3000])" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "3a trim" + }, + { + "navn": "U12-serveren-smaa-paa-hele-strengen", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const smaa = (s) => Array.from(String(s ?? ''), c => c.toLowerCase()).join('');", + "const smaa = (s) => String(s ?? '').toLowerCase();" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1.15 serveren" + }, + { + "navn": "U13-hjaelperen-kanonisk-lighed", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "navne.firstIndex(where: { smaa(Array($0.unicodeScalars)) == lav })", + "navne.firstIndex(where: { String(String.UnicodeScalarView(smaa(Array($0.unicodeScalars)))) == String(String.UnicodeScalarView(lav)) })" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2.16 hjaelperen" + }, + { + "navn": "U14-serveren-id-uden-praecist-trin", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const hit = apps.find(a => (a.bundleId || '') === w)\n || ", + "const hit = " + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1a.2 serveren" + }, + { + "navn": "U15-hjaelperen-id-uden-store-smaa-trin", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + " if let i = ids.firstIndex(where: { $0.map { smaa(Array($0.unicodeScalars)) } == lw }) { return .fundet(i) }\n", + " _ = lw\n" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2a.1 hjaelperen" + }, + { + "navn": "U16-serveren-normaliserer-foer-praecist", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const w = String(want ?? '').trim();", + "const w = navneNoegle(want);" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1.5 serveren" + }, + { + "navn": "U17-hjaelperen-normaliserer-foer-praecist", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "let lav = smaa(trim(want))", + "let lav = noegle(want)" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2.5 hjaelperen" + }, + { + "navn": "U18-oversaettelsen-doed", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "where a[i] == \"--app\" && !a[i + 1].hasPrefix(\"--\")", + "where a[i] == \"--app-x\" && !a[i + 1].hasPrefix(\"--\")" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2c.1" + }, + { + "navn": "U19-leveringen-sammenligner-navne-selv", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + "guard let app = AX.app(bundleId: navn) else {", + "guard let app = AX.app(bundleId: navn) ?? AX.allApps().first(where: { $0.localizedName?.lowercased() == navn.lowercased() }) else {" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6d" + }, + { + "navn": "U20-vinduesfilter-sammenligner-navne-selv", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + "if let scope = args.str(\"app\"), a.bundleIdentifier != scope { continue }", + "if let scope = args.str(\"app\"), a.bundleIdentifier != scope, a.localizedName?.lowercased() != scope.lowercased() { continue }" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6d" + }, + { + "navn": "U21-opstart-tvetydig-falder-til-disken", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + " if o.tvetydig { return (nil, false) }\n", + "" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6e" + }, + { + "navn": "U22-serveren-trimmer-ikke", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const w = String(want ?? '').trim();\n if (!w) return null;", + "const w = String(want ?? '');\n if (!w) return null;" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1.14 serveren" } ] diff --git a/helper/Sources/cmcp-helper/Accessibility.swift b/helper/Sources/cmcp-helper/Accessibility.swift index e22d84c1..59ee6142 100644 --- a/helper/Sources/cmcp-helper/Accessibility.swift +++ b/helper/Sources/cmcp-helper/Accessibility.swift @@ -162,12 +162,18 @@ enum AX { /// Det udvider ikke hvad der maa rammes: `main.swift`s faelles opslag /// faldt allerede tilbage paa `allApps()`, saa porten kunne i forvejen /// navngive et menulinje-program. Det var kun DE SEKS veje der ikke kunne. - static func app(bundleId: String) -> NSRunningApplication? { + static func app(bundleId: String) -> NSRunningApplication? { appOpslag(bundleId).app } + + /// Id'et eller navnet slaaet op efter Navne-reglen - samme regel som serverens port. + /// `tvetydig`: flere passer kun uden usynlige tegn; saa vaelges intet, og opstarten + /// falder heller ikke tilbage paa disken (R16, Astra). + static func appOpslag(_ hvad: String) -> (app: NSRunningApplication?, tvetydig: Bool) { let alle = allApps() - if let a = alle.first(where: { $0.bundleIdentifier == bundleId }) { return a } - // Navnet: samme regel som serverens opslag (Navne.swift) - ogsaa «\u{200E}WhatsApp». - guard let i = Navne.vaelg(alle.map { $0.localizedName ?? "" }, bundleId) else { return nil } - return alle[i] + switch Navne.vaelgApp(ids: alle.map { $0.bundleIdentifier }, navne: alle.map { $0.localizedName }, want: hvad) { + case .fundet(let i): return (alle[i], false) + case .tvetydig: return (nil, true) + case .intet: return (nil, false) + } } /// ⛔ ARKET DER STOPPER EN UBEVOGTET KOERSEL (22/9-2026) @@ -486,7 +492,7 @@ enum AX { // Tom maengde = vi kunne ikke spoerge vinduesserveren; saa tager vi alle. if !visible.isEmpty && !visible.contains(a.processIdentifier) { return false } guard let scope = scopeBundleId else { return true } - return a.bundleIdentifier == scope || a.localizedName?.lowercased() == scope.lowercased() + return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) } // ⛔ MAALT 24/9: BUDGETTET BANDT IKKE DET DET HED EFTER. @@ -680,7 +686,7 @@ enum AX { var nodes: [[String: Any]] = [] let apps = allApps().filter { a in guard let scope = bundleId else { return true } - return a.bundleIdentifier == scope || a.localizedName?.lowercased() == scope.lowercased() + return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) } outer: for app in apps { // Et spaerret program afleverer KUN at det findes - aldrig indhold. @@ -797,7 +803,7 @@ extension AX { let apps = allApps().filter { a in guard let scope = bundleId else { return true } - return a.bundleIdentifier == scope || a.localizedName?.lowercased() == scope.lowercased() + return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) } outer: for app in apps { @@ -1429,7 +1435,7 @@ extension AX { fund.append(URL(fileURLWithPath: m).appendingPathComponent(f)) } } - guard let i = Navne.vaelg(fund.map { $0.deletingPathExtension().lastPathComponent }, hvad) else { return nil } + guard case .fundet(let i) = Navne.vaelg(fund.map { $0.deletingPathExtension().lastPathComponent }, hvad) else { return nil } return fund[i] } @@ -1441,7 +1447,9 @@ extension AX { /// Svaret her er det bundle-id som `launchApp` ville starte - samme /// raekkefoelge, samme opslag - uden at starte noget. static func launchMaal(_ hvad: String) -> (bundleId: String?, koerer: Bool) { - if let k = AX.app(bundleId: hvad) { return (k.bundleIdentifier, true) } + let o = appOpslag(hvad) + if let k = o.app { return (k.bundleIdentifier, true) } + if o.tvetydig { return (nil, false) } guard let u = programURL(hvad) else { return (nil, false) } return (Bundle(url: u)?.bundleIdentifier, false) } @@ -1453,8 +1461,13 @@ extension AX { nonisolated(unsafe) static var sidstStartetPid: pid_t? static func launchApp(_ hvad: String, stille: Bool = false) -> (ok: Bool, why: String, bundleId: String?) { + // Samme opslag og samme raekkefoelge som launchMaal, saa porten vurderede det der startes. + let opslag = appOpslag(hvad) + if opslag.tvetydig { + return (false, "more than one running app is called '\(hvad)' once invisible characters are ignored - name it by bundle id", nil) + } // Allerede i gang? Saa er "start" bare "hent frem", og det siger vi. - if let k = AX.app(bundleId: hvad) { + if let k = opslag.app { // ⛔ MAALT 27/9 paa Gustavs Mac: Aktivitetsovervaagning og Spotify koerte, // men mennesket havde lukket vinduerne - og «left where it was» efterlod // intet at naa. Et menneske klikker paa Dock-ikonet. Vi beder programmet diff --git a/helper/Sources/cmcp-helper/Capture.swift b/helper/Sources/cmcp-helper/Capture.swift index 88c2c1f0..356a35dd 100644 --- a/helper/Sources/cmcp-helper/Capture.swift +++ b/helper/Sources/cmcp-helper/Capture.swift @@ -114,7 +114,7 @@ enum Capture { // skaerm programmets foerste vindue faktisk staar paa. if displayId == nil && displayIndex == nil, let bid = bundleId, let app = AX.allApps().first(where: { - $0.bundleIdentifier == bid || $0.localizedName?.lowercased() == bid.lowercased() + $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) }), let w = AX.windows(of: app).first, let r = AX.frame(w) { @@ -163,11 +163,13 @@ enum Capture { if let bid = bundleId { // En adgangskode-manager fotograferes ikke som maal: det filter // kan intet udelukke, og det hviler 100 % paa scanningen. + // Navnet sammenlignes her med vilje ogsaa paa Swifts maade: det kan kun + // tilfoeje et afslag (en adgangskode-manager), aldrig vaelge et maal. let navngivet = content.applications.filter { $0.bundleIdentifier == bid || $0.applicationName.lowercased() == bid.lowercased() } let axNavngivet = AX.allApps().filter { - $0.bundleIdentifier == bid || $0.localizedName?.lowercased() == bid.lowercased() + $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) } if erSpaerretId(bid) || navngivet.contains(where: { erSpaerretId($0.bundleIdentifier) }) || axNavngivet.contains(where: { erSpaerretId($0.bundleIdentifier) }) { @@ -185,7 +187,7 @@ enum Capture { let filter: SCContentFilter if let bid = bundleId { let apps = content.applications.filter { - $0.bundleIdentifier == bid || $0.applicationName.lowercased() == bid.lowercased() + $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) } guard !apps.isEmpty else { // MAALT 18/9: her stod "the app is not running", og det var @@ -198,7 +200,7 @@ enum Capture { // program der staar lige for naesen af dem. Vi spoerger // arbejdsbordet i stedet og siger hvad der faktisk er galt. let running = AX.allApps().contains { - $0.bundleIdentifier == bid || $0.localizedName?.lowercased() == bid.lowercased() + $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) } box.set(failure: running ? "'\(bid)' is running, but has no windows on the desktop that is showing. A full-screen app gives itself its own desktop, and everything else sits on another. Switch to it with computer_activate or computer_space, or leave full screen." diff --git a/helper/Sources/cmcp-helper/Navne.swift b/helper/Sources/cmcp-helper/Navne.swift index a55976a3..fa185232 100644 --- a/helper/Sources/cmcp-helper/Navne.swift +++ b/helper/Sources/cmcp-helper/Navne.swift @@ -9,25 +9,72 @@ import Foundation /// /// Reglen er den SAMME som serverens `findProgram` i helper.js - porten og /// leveringen skal ramme samme program (18/9). test/usynlige-navne.mjs koerer -/// begge sider mod de samme tilfaelde: -/// 1. et praecist navn (store/smaa bogstaver ligegyldige) vinder, som foer -/// 2. ellers navnet uden usynlige formateringstegn (Unicode Cf) - men kun naar -/// praecis ét program passer. Passer flere, vaelges intet, og et ukendt maal -/// afvises. +/// begge sider mod de samme tilfaelde og sammenligner tegnmaengderne udtoemmende: +/// 1. bundle-id praecist, saa bundle-id uden hensyn til store/smaa bogstaver +/// 2. et praecist navn (smaa bogstaver) - det foerste +/// 3. ellers navnet uden usynlige formateringstegn (Unicode Cf) - men kun naar +/// praecis ét program passer. Passer flere, er svaret «tvetydig», og et +/// tvetydigt navn afvises (ogsaa ved opstart: ingen faldbag til disken). +/// +/// ⛔ R16 (Astra + Opus, MAALT 9/10): foerste udgave brugte Swifts egne regler - +/// `.whitespacesAndNewlines` (fjerner ogsaa U+0085 og U+200B, men ikke U+FEFF), +/// `lowercased()` paa hele strengen og Swifts kanoniske `==` (é = e+U+0301). JS +/// goer det modsatte paa alle tre. «Computer MCP\u{85}» blev derfor «ukendt maal» +/// i porten og menulinje-ikonet i hjaelperen. Nu: JS' trim-maengde ordret, smaa +/// bogstaver tegn for tegn, og sammenligning paa tegn - ikke paa kanonisk lighed. enum Navne { - static func noegle(_ s: String) -> String { + enum Valg: Equatable { case fundet(Int), intet, tvetydig } + + /// Praecis ECMAScripts WhiteSpace + LineTerminator - det `String.prototype.trim` fjerner. + static let kant: Set = Set([0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20, 0xA0, 0x1680] + + Array(0x2000...0x200A) + [0x2028, 0x2029, 0x202F, 0x205F, 0x3000, 0xFEFF]) + + static func trim(_ s: String) -> [Unicode.Scalar] { + var a = Array(s.unicodeScalars) + while let f = a.first, kant.contains(f.value) { a.removeFirst() } + while let l = a.last, kant.contains(l.value) { a.removeLast() } + return a + } + + /// Smaa bogstaver tegn for tegn - som JS' `Array.from(s, c => c.toLowerCase())`. + static func smaa(_ t: [Unicode.Scalar]) -> [Unicode.Scalar] { + t.flatMap { Array(String($0).lowercased().unicodeScalars) } + } + + static func noegle(_ s: String) -> [Unicode.Scalar] { var v = String.UnicodeScalarView() v.append(contentsOf: s.unicodeScalars.filter { $0.properties.generalCategory != .format }) - return String(v).trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + return smaa(trim(String(v))) } - /// Hvilket af `navne` mener `want`? nil = intet entydigt. - static func vaelg(_ navne: [String], _ want: String) -> Int? { - let lav = want.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() - if let i = navne.firstIndex(where: { $0.lowercased() == lav }) { return i } + /// Navnetrinene (2-3). Bruges alene for programmer paa disken, der ikke har et id endnu. + static func vaelg(_ navne: [String], _ want: String) -> Valg { + let lav = smaa(trim(want)) + guard !lav.isEmpty else { return .intet } + if let i = navne.firstIndex(where: { smaa(Array($0.unicodeScalars)) == lav }) { return .fundet(i) } let n = noegle(want) - guard !n.isEmpty else { return nil } + guard !n.isEmpty else { return .intet } let hits = navne.indices.filter { noegle(navne[$0]) == n } - return hits.count == 1 ? hits[0] : nil + return hits.count == 1 ? .fundet(hits[0]) : (hits.isEmpty ? .intet : .tvetydig) + } + + /// Et koerende program: trin 1-3 i den raekkefoelge serverens `findProgram` bruger. + static func vaelgApp(ids: [String?], navne: [String?], want: String) -> Valg { + let w = trim(want) + guard !w.isEmpty else { return .intet } + if let i = ids.firstIndex(where: { $0.map { Array($0.unicodeScalars) } == w }) { return .fundet(i) } + let lw = smaa(w) + if let i = ids.firstIndex(where: { $0.map { smaa(Array($0.unicodeScalars)) } == lw }) { return .fundet(i) } + return vaelg(navne.map { $0 ?? "" }, want) + } + + /// `--app ` oversat ÉN gang, foer nogen kommando ser det. `slaaOp` er + /// opslaget blandt de koerende programmer; giver det intet, staar argumentet uroert. + static func oversaet(_ argv: [String], slaaOp: (String) -> String?) -> [String] { + var a = argv + for i in a.indices.dropLast() where a[i] == "--app" && !a[i + 1].hasPrefix("--") { + if let bid = slaaOp(a[i + 1]) { a[i + 1] = bid } + } + return a } } diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 1a2b70a7..295369ea 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -12,9 +12,9 @@ import Foundation /// om, er praecis den slags der goer at man ikke kan lade den koere alene. func modtager(_ args: Args) -> pid_t? { guard let navn = args.str("app") else { return nil } - guard let app = AX.app(bundleId: navn) - ?? AX.allApps().first(where: { $0.bundleIdentifier == navn }) - ?? AX.allApps().first(where: { $0.localizedName?.lowercased() == navn.lowercased() }) else { + // Kun Navne-reglen (R16): en ekstra sammenligning her med Swifts egne regler + // kunne levere til et program porten aldrig vurderede. + guard let app = AX.app(bundleId: navn) else { Out.fail("'\(navn)' is not running, so there is no queue to deliver to", code: "app-not-found") } @@ -30,15 +30,7 @@ let HELPER_VERSION = "0.2.2" /// Nu oversaettes et navn ÉN gang, her, til det bundle-id Navne-reglen vaelger /// blandt de koerende programmer - samme program som serverens port vurderede. /// Koerer programmet ikke, eller passer flere, staar argumentet uroert. -func oversaetApp(_ argv: [String]) -> [String] { - var a = argv - for i in a.indices.dropLast() where a[i] == "--app" && !a[i + 1].hasPrefix("--") { - if let bid = AX.app(bundleId: a[i + 1])?.bundleIdentifier { a[i + 1] = bid } - } - return a -} - -let args = Args(oversaetApp(CommandLine.arguments)) +let args = Args(Navne.oversaet(CommandLine.arguments) { AX.app(bundleId: $0)?.bundleIdentifier }) // ⛔ FUNDET AF SIKKERHEDSREVIEWET 20/9. `contains` og `title` gik som // ARGUMENTER, og `ps` viser hele kommandolinjen for enhver proces med samme @@ -148,9 +140,7 @@ case "windows": let kilde = args.str("app") != nil ? AX.allApps() : AX.runningApps() var ulaeselige: [String] = [] for a in kilde { - if let scope = args.str("app"), - a.bundleIdentifier != scope, - a.localizedName?.lowercased() != scope.lowercased() { continue } + if let scope = args.str("app"), a.bundleIdentifier != scope { continue } // navnet er oversat ved indgangen let svar = AX.windowsMed(of: a) // ⛔ 24/9: et program der ikke svarede, maa ikke se ud som et program // uden vinduer. Se `windowsMed` for hvordan de to blev blandet. diff --git a/mcp-server/helper.js b/mcp-server/helper.js index ab8e72b7..b8d63dd2 100644 --- a/mcp-server/helper.js +++ b/mcp-server/helper.js @@ -142,15 +142,23 @@ export function callHelper(args, { timeout = 30000, stdin = null } = {}) { /// Samme regel som hjaelperens `Navne.vaelg` (Navne.swift), saa porten og /// leveringen rammer samme program (18/9) - test/usynlige-navne.mjs koerer /// begge sider mod de samme tilfaelde: -/// 1. bundle-id, saa et praecist navn (store/smaa bogstaver ligegyldige), som foer +/// 1. bundle-id praecist, saa bundle-id uden hensyn til store/smaa bogstaver +/// 1b. et praecist navn (smaa bogstaver tegn for tegn) - det foerste /// 2. ellers navnet uden usynlige formateringstegn (Unicode Cf) - men kun naar /// praecis ét program passer. Passer flere, vaelges intet: et ukendt maal afvises. const USYNLIGE = /\p{Cf}/gu; -export const navneNoegle = (s) => String(s ?? '').replace(USYNLIGE, '').trim().toLowerCase(); +/// ⛔ R16 (Astra + Opus, MAALT 9/10): smaa bogstaver TEGN FOR TEGN og sammenligning +/// paa tegn - som Navne.swift. `toLowerCase()` paa hele strengen bruger graesk +/// slut-sigma, Swift goer ikke; tegn for tegn er de ens (proeven tjekker hvert tegn). +const smaa = (s) => Array.from(String(s ?? ''), c => c.toLowerCase()).join(''); +export const navneNoegle = (s) => smaa(String(s ?? '').replace(USYNLIGE, '').trim()); export function findProgram(apps, want) { - const lower = String(want ?? '').trim().toLowerCase(); - const hit = apps.find(a => (a.bundleId || '').toLowerCase() === lower) - || apps.find(a => (a.name || '').toLowerCase() === lower); + const w = String(want ?? '').trim(); + if (!w) return null; + const lw = smaa(w); + const hit = apps.find(a => (a.bundleId || '') === w) + || apps.find(a => a.bundleId && smaa(a.bundleId) === lw) + || apps.find(a => smaa(a.name || '') === lw); if (hit) return hit; const n = navneNoegle(want); if (!n) return null; diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index 0951fac5..7364e028 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -1,15 +1,18 @@ -// USYNLIGE NAVNE: «WhatsApp» skal finde «‎WhatsApp» - i porten OG i leveringen. +// USYNLIGE NAVNE: «WhatsApp» skal finde «‎WhatsApp» - i porten OG i leveringen, +// og de to skal ALTID vaelge det samme program. // // ⛔ 9/10 (F1 paa Gustavs Mac): WhatsApp ligger som /Applications/‎WhatsApp.app og -// hedder «‎WhatsApp» naar den koerer (CFBundleDisplayName). `computer_launch -// {app:"WhatsApp", background:true}` blev «ukendt maal» og afvist, og ethvert skrivende -// kald i en koerende WhatsApp ligesaa. Rettelsen er ÉN regel paa to sprog: serverens -// findProgram (helper.js) og hjaelperens Navne.vaelg (Navne.swift). Proeven koerer -// begge mod SAMME tabel, saa de ikke kan glide fra hinanden - porten skal vurdere det -// program leveringen rammer (18/9). -// -// Ingen skaerm, intet program startes. Kun paa en Mac med WhatsApp maales den rigtige -// hjaelper ogsaa (punkt 9); ellers siges det. +// hedder «‎WhatsApp» naar den koerer. `app: "WhatsApp"` blev «ukendt maal». +// ⛔ R16 (Astra + Opus, MAALT): foerste rettelse brugte Swifts egne regler (trim med +// U+0085/U+200B, smaa bogstaver paa hele strengen, kanonisk ==), saa porten og +// hjaelperen kunne vaelge forskellige programmer - «Computer MCP\u0085» var ukendt +// for porten og menulinje-ikonet for hjaelperen. Proeven er derfor tre ting: +// A. samme tabeller gennem serverens findProgram og hjaelperens Navne (Swift) +// B. de tre tegn-regler (trim, usynlige tegn, smaa bogstaver) sammenlignet for +// HVERT Unicode-tegn mellem JS og Swift +// C. kaldestederne bundet: hjaelperen slaar kun navne op gennem Navne, og +// ellers sammenlignes kun id'er +// Ingen skaerm, intet program startes. import './ryd-op.mjs'; import { execFileSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, readFileSync, existsSync, readdirSync } from 'node:fs'; @@ -23,59 +26,137 @@ const KILDE = join(ROOT, 'helper', 'Sources', 'cmcp-helper'); const fails = []; const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; -const LRM = '‎', RLM = '‏', ZWSP = '​'; -// [navne, hvad agenten skriver, forventet indeks (null = intet entydigt), hvad tilfaeldet maaler] -const TABEL = [ +const LRM = '‎', RLM = '‏', ZWSP = '​', NEL = '\u0085', BOM = ''; +// A1 · navne alene: [navne, hvad agenten skriver, forventet indeks (null = intet), hvad maales] +const NAVNE = [ [['Finder', `${LRM}WhatsApp`], 'WhatsApp', 1, 'usynligt tegn foran navnet'], [[`${LRM}WhatsApp`, `WhatsApp${RLM}`], 'WhatsApp', null, 'to passer uden de usynlige tegn: intet vaelges'], [['WhatsApp', `${LRM}WhatsApp`], 'WhatsApp', 0, 'et praecist navn vinder over et der kun passer uden usynlige tegn'], + [[`${LRM}WhatsApp`, 'WhatsApp'], 'WhatsApp', 1, 'samme, omvendt raekkefoelge'], + [['WhatsApp', `${LRM}WhatsApp`], `${LRM}WhatsApp`, 1, 'det usynlige navn kopieret ordret vaelger sig selv'], [[`${LRM}WhatsApp`], LRM, null, 'kun usynlige tegn finder intet'], [[`${LRM}WhatsApp`], 'WhatsAp', null, 'et andet navn finder intet'], [['Notes'], 'notes', 0, 'store/smaa bogstaver som foer'], - [[`${LRM}WhatsApp`], `${LRM}WhatsApp`, 0, 'navnet kopieret ordret fra computer_apps'], [[`Whats${ZWSP}App`], 'whatsapp', 0, 'usynligt tegn inde i navnet'], [['Notes', 'Noter'], 'Note', null, 'et forkortet navn finder intet'], + [['Computer MCP'], `Computer MCP${NEL}`, null, 'U+0085 i kanten fjernes ikke (Opus R16)'], + [[`${ZWSP}Passwords`, 'Passwords'], `${ZWSP}Passwords`, 0, 'U+200B i kanten fjernes ikke (Astra R16)'], + [[`${NEL}Notes`, 'Notes'], `${NEL}Notes`, 0, 'U+0085 foran: det praecise navn'], + [[`${BOM}Notes`, 'Notes'], `${BOM}Notes`, 1, 'U+FEFF i kanten fjernes (som JS trim)'], + [['ος', 'οσ'], 'ΟΣ', 1, 'smaa bogstaver tegn for tegn (ingen graesk slut-sigma)'], + [['é', 'é'], 'é', 1, 'sammenligning paa tegn, ikke kanonisk lighed'], + [[' Notes'], 'Notes', 0, 'mellemrum foran navnet: passer uden usynlige tegn og kanter'], + [['Notes'], ' ', null, 'kun mellemrum finder intet'], +]; +// A2 · koerende programmer med id: [ids, navne, ønske, forventet, hvad] +const APPS = [ + [['dk.SAFE', 'com.apple.Passwords'], ['Harmless', 'dk.safe'], 'dk.safe', 0, 'bundle-id uden hensyn til store/smaa bogstaver foer navne (Astra R16)'], + [['com.x.App', 'com.x.app'], ['A', 'B'], 'com.x.app', 1, 'et praecist bundle-id vinder over ét der kun passer uden store/smaa'], + [[null, 'dk.y'], ['Y', 'Z'], 'Y', 0, 'et program uden id findes paa navnet'], + [['net.whatsapp.WhatsApp', 'com.apple.finder'], [`${LRM}WhatsApp`, 'Finder'], 'WhatsApp', 0, 'Gustavs Mac'], + [['dk.a'], ['A'], ` dk.a${BOM}`, 0, 'id med kanter'], + [['dk.a', 'dk.b'], [`${LRM}X`, `X${RLM}`], 'X', null, 'tvetydigt navn'], +]; +// A3 · oversaettelsen ved hjaelperens indgang: [argv, opslag, forventet argv, hvad] +const OVERSAET = [ + [['h', 'find', '--app', 'WhatsApp', '--role', 'AXButton'], { WhatsApp: 'net.whatsapp.WhatsApp' }, ['h', 'find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton'], 'navnet bliver til id'], + [['h', 'find', '--app', '--role', 'AXButton'], { '--role': 'x' }, ['h', 'find', '--app', '--role', 'AXButton'], '--app uden vaerdi roeres ikke'], + [['h', 'find', '--app', 'Ukendt'], {}, ['h', 'find', '--app', 'Ukendt'], 'intet opslag: uroert'], + [['h', 'windows', '--app'], { '': 'x' }, ['h', 'windows', '--app'], '--app sidst roeres ikke'], ]; -// 1-2 · serverens regel const { findProgram } = await import(join(ROOT, 'mcp-server', 'helper.js')); -const jsSvar = TABEL.map(([navne, want]) => { +const jsNavne = NAVNE.map(([navne, want]) => { const apps = navne.map((name, i) => ({ name, bundleId: `dk.proeve.${i}` })); - const hit = findProgram(apps, want); - return hit ? apps.indexOf(hit) : null; + const hit = findProgram(apps, want); return hit ? apps.indexOf(hit) : null; }); -TABEL.forEach(([, , forventet, hvad], i) => - check(`1.${i + 1} serveren: ${hvad}`, jsSvar[i] === forventet, `fik ${jsSvar[i]}, ventede ${forventet}`)); +const jsApps = APPS.map(([ids, navne, want]) => { + const apps = ids.map((bundleId, i) => ({ bundleId: bundleId ?? '', name: navne[i] })); + const hit = findProgram(apps, want); return hit ? apps.indexOf(hit) : null; +}); + +// B · tegn-reglerne i JS, for hvert Unicode-tegn +const alleTegn = function* () { for (let cp = 0; cp <= 0x10FFFF; cp++) if (cp < 0xD800 || cp > 0xDFFF) yield cp; }; +const jsTrim = [], jsCf = [], jsSmaa = []; +for (const cp of alleTegn()) { + const c = String.fromCodePoint(cp); + if ((c + 'x').trim() === 'x') jsTrim.push(cp); + if (/\p{Cf}/u.test(c)) jsCf.push(cp); + const l = c.toLowerCase(); if (l !== c) jsSmaa.push(`${cp.toString(16)}:${Array.from(l, x => x.codePointAt(0).toString(16)).join(',')}`); +} -// 2 · hjaelperens regel: Navne.swift kompileret for sig, samme tabel +// A + B · hjaelperens Navne.swift, kompileret for sig const ARB = mkdtempSync(join(tmpdir(), 'cmcp-usynlige-navne-')); writeFileSync(join(ARB, 'main.swift'), `import Foundation -struct T: Decodable { let navne: [String]; let want: String } -let ind = try! JSONDecoder().decode([T].self, from: FileHandle.standardInput.readDataToEndOfFile()) -let ud: [Any] = ind.map { t in Navne.vaelg(t.navne, t.want).map { $0 as Any } ?? NSNull() } +struct N: Decodable { let navne: [String]; let want: String } +struct A: Decodable { let ids: [String?]; let navne: [String?]; let want: String } +struct O: Decodable { let argv: [String]; let opslag: [String: String] } +struct Ind: Decodable { let navne: [N]; let apps: [A]; let oversaet: [O] } +let ind = try! JSONDecoder().decode(Ind.self, from: FileHandle.standardInput.readDataToEndOfFile()) +func tal(_ v: Navne.Valg) -> Any { if case .fundet(let i) = v { return i }; return NSNull() } +var trim: [Int] = [], cf: [Int] = [], smaa: [String] = [] +for cp in 0...0x10FFFF where cp < 0xD800 || cp > 0xDFFF { + let s = Unicode.Scalar(UInt32(cp))! + if Navne.kant.contains(UInt32(cp)) { trim.append(cp) } + if s.properties.generalCategory == .format { cf.append(cp) } + let l = Navne.smaa([s]); if l != [s] { smaa.append(String(cp, radix: 16) + ":" + l.map { String($0.value, radix: 16) }.joined(separator: ",")) } +} +let ud: [String: Any] = [ + "navne": ind.navne.map { tal(Navne.vaelg($0.navne, $0.want)) }, + "tvetydig": ind.navne.map { Navne.vaelg($0.navne, $0.want) == .tvetydig }, + "apps": ind.apps.map { tal(Navne.vaelgApp(ids: $0.ids, navne: $0.navne, want: $0.want)) }, + "oversaet": ind.oversaet.map { o in Navne.oversaet(o.argv) { o.opslag[$0] } }, + "trim": trim, "cf": cf, "smaa": smaa] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); const BIN = join(ARB, 'navne'); -execFileSync('swiftc', [join(KILDE, 'Navne.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 180000 }); -const swiftSvar = JSON.parse(execFileSync(BIN, { input: JSON.stringify(TABEL.map(([navne, want]) => ({ navne, want }))), encoding: 'utf8' })); -TABEL.forEach(([, , forventet, hvad], i) => - check(`2.${i + 1} hjaelperen: ${hvad}`, swiftSvar[i] === forventet, `fik ${swiftSvar[i]}, ventede ${forventet}`)); -check('3 serveren og hjaelperen svarer ens paa hele tabellen', JSON.stringify(jsSvar) === JSON.stringify(swiftSvar), - `server ${JSON.stringify(jsSvar)} · hjaelper ${JSON.stringify(swiftSvar)}`); +execFileSync('swiftc', ['-O', join(KILDE, 'Navne.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 300000 }); +const sw = JSON.parse(execFileSync(BIN, { encoding: 'utf8', maxBuffer: 64 << 20, timeout: 300000, input: JSON.stringify({ + navne: NAVNE.map(([navne, want]) => ({ navne, want })), + apps: APPS.map(([ids, navne, want]) => ({ ids, navne, want })), + oversaet: OVERSAET.map(([argv, opslag]) => ({ argv, opslag })), +}) })); + +NAVNE.forEach(([, , forventet, hvad], i) => { + check(`1.${i + 1} serveren: ${hvad}`, jsNavne[i] === forventet, `fik ${jsNavne[i]}, ventede ${forventet}`); + check(`2.${i + 1} hjaelperen: ${hvad}`, sw.navne[i] === forventet, `fik ${sw.navne[i]}, ventede ${forventet}`); +}); +APPS.forEach(([, , , forventet, hvad], i) => { + check(`1a.${i + 1} serveren (id+navn): ${hvad}`, jsApps[i] === forventet, `fik ${jsApps[i]}, ventede ${forventet}`); + check(`2a.${i + 1} hjaelperen (id+navn): ${hvad}`, sw.apps[i] === forventet, `fik ${sw.apps[i]}, ventede ${forventet}`); +}); +check('2b et tvetydigt navn er sit eget svar i hjaelperen (ingen faldbag til disken)', sw.tvetydig[1] === true && sw.tvetydig[0] === false); +OVERSAET.forEach(([, , forventet, hvad], i) => + check(`2c.${i + 1} oversaettelsen ved indgangen: ${hvad}`, JSON.stringify(sw.oversaet[i]) === JSON.stringify(forventet), JSON.stringify(sw.oversaet[i]))); +const forskel = (a, b) => { const s = new Set(b.map(String)); const t = new Set(a.map(String)); + return [...a.filter(x => !s.has(String(x))), ...b.filter(x => !t.has(String(x)))].slice(0, 6); }; +check(`3a trim: samme ${jsTrim.length} tegn i JS og Swift`, jsTrim.length === sw.trim.length && forskel(jsTrim, sw.trim).length === 0, JSON.stringify(forskel(jsTrim, sw.trim))); +check(`3b usynlige tegn (Cf): samme ${jsCf.length} tegn i JS og Swift`, forskel(jsCf, sw.cf).length === 0, JSON.stringify(forskel(jsCf, sw.cf))); +check(`3c smaa bogstaver: samme ${jsSmaa.length} tegn i JS og Swift`, forskel(jsSmaa, sw.smaa).length === 0, JSON.stringify(forskel(jsSmaa, sw.smaa))); -// 4-6 · reglen er den der BRUGES: begge serveropslag og begge hjaelperopslag kalder den +// C · kaldestederne const helperJs = readFileSync(join(ROOT, 'mcp-server', 'helper.js'), 'utf8'); const krop = (src, start) => { const i = src.indexOf(start); return i < 0 ? '' : src.slice(i, src.indexOf('\n}', i)); }; check('4 resolveBundleId (porten) bruger findProgram', /findProgram\(/.test(krop(helperJs, 'export async function resolveBundleId('))); check('5 resolveApp (hvem er forrest) bruger findProgram', /findProgram\(/.test(krop(helperJs, 'export async function resolveApp('))); -const ax = readFileSync(join(KILDE, 'Accessibility.swift'), 'utf8'); -const swiftKrop = (start) => { const i = ax.indexOf(start); return i < 0 ? '' : ax.slice(i, ax.indexOf('\n }\n', i)); }; -check('6a et koerende program slaas op med Navne.vaelg (AX.app)', /Navne\.vaelg\(/.test(swiftKrop('static func app(bundleId: String)'))); -check('6b et lukket program paa disken slaas op med Navne.vaelg (programURL)', /Navne\.vaelg\(/.test(swiftKrop('static func programURL('))); -const mainSwift = readFileSync(join(KILDE, 'main.swift'), 'utf8'); -check('6c hjaelperen oversaetter --app ét sted, foer alle kommandoer (Args bygges af oversaetApp)', - /^let args = Args\(oversaetApp\(CommandLine\.arguments\)\)/m.test(mainSwift) - && /AX\.app\(bundleId:/.test(mainSwift.slice(mainSwift.indexOf('func oversaetApp('), mainSwift.indexOf('let args = Args(')))); +const kilder = readdirSync(KILDE).filter(f => f.endsWith('.swift')); +const src = Object.fromEntries(kilder.map(f => [f, readFileSync(join(KILDE, f), 'utf8')])); +const ax = src['Accessibility.swift'], mainSwift = src['main.swift']; +check('6a AX.app er opslaget og intet andet', /static func app\(bundleId: String\) -> NSRunningApplication\? \{ appOpslag\(bundleId\)\.app \}/.test(ax)); +check('6a2 opslaget vaelger med Navne.vaelgApp og returnerer netop det valgte', + /Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); +check('6b programmer paa disken: Navne.vaelg og netop det valgte', /guard case \.fundet\(let i\) = Navne\.vaelg\(fund\.map \{ \$0\.deletingPathExtension\(\)\.lastPathComponent \}, hvad\) else \{ return nil \}\n\s+return fund\[i\]/.test(ax)); +check('6c --app oversaettes ét sted, foer alle kommandoer', /^let args = Args\(Navne\.oversaet\(CommandLine\.arguments\) \{ AX\.app\(bundleId: \$0\)\?\.bundleIdentifier \}\)/m.test(mainSwift)); +const navneSammenligninger = kilder.flatMap(f => src[f].split('\n').map((l, i) => ({ f, n: i + 1, l }))) + .filter(({ f, l }) => f !== 'Navne.swift' && /(localizedName|applicationName)\??\.lowercased\(\)/.test(l)); +check('6d ingen anden sammenligning af programnavne end adgangskode-tjekket (kun et ekstra afslag)', + navneSammenligninger.length === 1 && navneSammenligninger[0].f === 'Capture.swift' + && /let navngivet = content\.applications\.filter \{\n\s+\$0\.bundleIdentifier == bid \|\| \$0\.applicationName\.lowercased\(\) == bid\.lowercased\(\)\n\s+\}\n\s+let axNavngivet/.test(src['Capture.swift']), + navneSammenligninger.map(x => `${x.f}:${x.n}`).join(', ')); +check('6e opstarten stopper ved et tvetydigt navn - baade opslaget og selve starten', + /let o = appOpslag\(hvad\)\n\s+if let k = o\.app \{ return \(k\.bundleIdentifier, true\) \}\n\s+if o\.tvetydig \{ return \(nil, false\) \}/.test(ax) + && /let opslag = appOpslag\(hvad\)\n\s+if opslag\.tvetydig \{/.test(ax)); +check('6f leveringen (modtager) bruger kun opslaget', /guard let app = AX\.app\(bundleId: navn\) else \{/.test(mainSwift)); // 7-8 · gennem serverens rigtige opslag, med en attrap der svarer som Gustavs Mac const h = lavFalskHjaelper('cmcp-usynlige'); @@ -90,23 +171,29 @@ check('7 porten ser net.whatsapp.WhatsApp for app "WhatsApp"', bid === 'net.what const ra = await resolveApp('WhatsApp'); check('8 resolveApp ser samme program', ra?.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(ra)); -// 9 · den rigtige hjaelper paa en Mac hvor WhatsApp ligger med det usynlige tegn -const harWhatsApp = ['/Applications'].some(m => { try { return readdirSync(m).includes(`${LRM}WhatsApp.app`); } catch { return false; } }); +// 9-11 · den rigtige hjaelper const hjaelper = [join(ROOT, 'helper', '.build', 'release', 'cmcp-helper'), join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper')].find(p => existsSync(p)); -if (harWhatsApp && hjaelper) { - let r; try { r = JSON.parse(execFileSync(hjaelper, ['resolve-app', '--app', 'WhatsApp'], { encoding: 'utf8', timeout: 15000 })); } catch (e) { r = { fejl: String(e.stdout || e.message).slice(0, 200) }; } - check(`9 den rigtige hjaelper finder /Applications/${LRM}WhatsApp.app ud fra "WhatsApp"`, r.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(r)); - // 10 · koerer WhatsApp, skal find og vinduer med navnet ramme det samme som med id'et - const koerer = (() => { try { return JSON.parse(execFileSync(hjaelper, ['apps'], { encoding: 'utf8', timeout: 15000 })).apps.some(x => x.bundleId === 'net.whatsapp.WhatsApp'); } catch { return false; } })(); - if (koerer) { - const j = (a) => { try { return JSON.parse(execFileSync(hjaelper, a, { encoding: 'utf8', timeout: 15000 })); } catch (e) { return { fejl: String(e.stdout || e.message).slice(0, 160) }; } }; +const j = (a) => { try { return JSON.parse(execFileSync(hjaelper, a, { encoding: 'utf8', timeout: 15000 })); } catch (e) { try { return JSON.parse(String(e.stdout)); } catch { return { fejl: String(e.message).slice(0, 160) }; } } }; +if (!hjaelper) console.log('SPR. 9-11 ingen bygget hjaelper'); +else { + const koerende = (j(['apps', '--all']).apps || []).map(a => a.bundleId); + // 11 · R2 (Opus): bindingen maalt paa et program der koerer paa enhver Mac + if (koerende.includes('com.apple.finder')) { + check('11a resolve-app --app Finder: navnet er oversat til id ved indgangen', j(['resolve-app', '--app', 'Finder']).app === 'com.apple.finder'); + check('11b resolve-app --app finder: smaa bogstaver', j(['resolve-app', '--app', 'finder']).app === 'com.apple.finder'); + check(`11c resolve-app --app "Finder\\u0085": U+0085 fjernes ikke - intet fundet`, j(['resolve-app', '--app', `Finder${NEL}`]).bundleId == null); + } else console.log('SPR. 11 Finder koerer ikke'); + const harWhatsApp = (() => { try { return readdirSync('/Applications').includes(`${LRM}WhatsApp.app`); } catch { return false; } })(); + if (harWhatsApp) { + const r = j(['resolve-app', '--app', 'WhatsApp']); + check(`9 den rigtige hjaelper finder /Applications/${LRM}WhatsApp.app ud fra "WhatsApp"`, r.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(r).slice(0, 160)); + } else console.log('SPR. 9 WhatsApp ligger ikke med det usynlige tegn paa denne Mac'); + if (koerende.includes('net.whatsapp.WhatsApp')) { const vn = j(['windows', '--app', 'WhatsApp']), vi = j(['windows', '--app', 'net.whatsapp.WhatsApp']); check('10a windows --app WhatsApp = samme vinduer som med id', vn.count >= 1 && vn.count === vi.count, `navn ${vn.count} · id ${vi.count}`); const fn = j(['find', '--app', 'WhatsApp', '--role', 'AXButton', '--limit', '3']), fi = j(['find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton', '--limit', '3']); check('10b find --app WhatsApp = samme fund som med id', fn.count >= 1 && fn.count === fi.count, `navn ${fn.count} · id ${fi.count}`); } else console.log('SPR. 10 WhatsApp koerer ikke - find og vinduer med navnet er ikke maalt'); -} else { - console.log(`SPR. 9 den rigtige hjaelper - ${harWhatsApp ? 'ingen bygget hjaelper' : 'WhatsApp ligger ikke med det usynlige tegn paa denne Mac'}`); } console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); From 7bc3f411023378391e6a6f47db44589d0a6160d2 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 10:34:23 +0200 Subject: [PATCH 106/132] feat(ikon): boksen i hjoernet - hvor du arbejder, hvad agenterne goer, og spoergsmaalet med Allow (Touch ID) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gustav 9/10: «flydende komponent i hoejre hjoerne ... saa man kan se hvad der sker, naar de koerer» og «saa kan jeg ogsaa goere hvad du beder mig om»; «1 ja» til Allow i boksen (R9 kraevede hans udtrykkelige ja). MAALT under F1: P1 udloeb, fordi boksen stod i hjoernet af den anden skaerm (x=4794 paa en ultrabred skaerm, musen var der) og kun sagde «Needs you». - Placering: skaermen med det forreste vindue (ellers musens), flyttes med naar mennesket skifter skaerm og naar skaerme saettes i/tages ud. - Indhold: op til tre agenter med program og hvad de goer nu (+N). - Spoergsmaal: orange, hvem der spoerger, HELE teksten (<=280 tegn) og menuens egne knapper. Allow gaar gennem tilladNonce -> bekraeftMenneske (Touch ID), samme vej som menuen; laengere spoergsmaal faar ingen Allow i boksen. Knapperne svarer paa det spoergsmaal boksen viste (nonce med teksten). - Tager aldrig tastaturet (canBecomeKey false, .nonactivatingPanel); sharingType .none (at den holdes ude af skaermbilleder er UMAALT, derfor ikke lovet i README). - Tekst.swift: boksIndhold, boksSkaerm, cocoaRamme (rene, proevede). - test/ikon-boks.mjs 25/25 (indhold, skaerm, --dump-question, bindinger); ikon-menu 3c opdateret. Mutanter X1-X13 alle roede. 157 ankre entydige. - README/CHANGELOG: boksen beskrevet; «the only thing on your screen» og «Allow only in a submenu» rettet. Sitets sider tages i dok-runden ved 0.2.2. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 156 ++++++++++++++++ .github/workflows/ci.yml | 5 + CHANGELOG.md | 7 + README.md | 20 +- helper/Sources/cmcp-status/Tekst.swift | 78 +++++++- helper/Sources/cmcp-status/main.swift | 244 +++++++++++++++++-------- mcp-server/README.md | 20 +- test/ikon-boks.mjs | 123 +++++++++++++ test/ikon-menu.mjs | 8 +- test/run-all.sh | 2 + 10 files changed, 569 insertions(+), 94 deletions(-) create mode 100644 test/ikon-boks.mjs diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index d8f4ac43..ac6ad364 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1742,5 +1742,161 @@ ], "proeve": "test/usynlige-navne.mjs", "forventet": "1.14 serveren" + }, + { + "navn": "X1-boksens-allow-uden-touch-id", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "case \"Allow (Touch ID)\": tilladNonce(n, kilde: \"allow-box\")", + "case \"Allow (Touch ID)\": aaben(n)?.svar(ok: true)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5a" + }, + { + "navn": "X2-boksens-allow-ved-lang-tekst", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if kilde == \"allow-box\" && renTekst(a.s.text).count > BOKS_MAX_TEGN { return }\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5c" + }, + { + "navn": "X3-allow-i-boksen-ved-lang-tekst", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + ".filter { helVist || $0 != \"Allow… (confirm with Touch ID)\" }", + ".filter { _ in true }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "2c" + }, + { + "navn": "X4-placering-efter-musen", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "let i = boksSkaerm(forrestVindue: forrestVindue(), mus: NSEvent.mouseLocation, skaerme: skaerme.map { $0.frame })\n let f = skaerme[i].visibleFrame", + "let i = boksSkaerm(forrestVindue: nil, mus: NSEvent.mouseLocation, skaerme: skaerme.map { $0.frame })\n let f = skaerme[i].visibleFrame" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5g" + }, + { + "navn": "X5-skaermvalget-ser-bort-fra-vinduet", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " if let v = forrestVindue, let i = skaerme.firstIndex(where: { $0.contains(CGPoint(x: v.midX, y: v.midY)) }) { return i }\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "3a" + }, + { + "navn": "X6-vinduets-ramme-ikke-omregnet", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "CGRect(x: cg.minX, y: hovedHoejde - cg.maxY, width: cg.width, height: cg.height)", + "CGRect(x: cg.minX, y: cg.minY, width: cg.width, height: cg.height)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "3c" + }, + { + "navn": "X7-boksen-i-skaermbilleder", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " sharingType = .none\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5i" + }, + { + "navn": "X8-ny-skaerm-flytter-ikke-boksen", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if self?.boks.isVisible == true { self?.boks.placer() }", + " _ = self" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5h" + }, + { + "navn": "X9-skifte-skaerm-flytter-ikke-boksen", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "\n else if boks.skalFlyttes() { boks.placer() }", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5h" + }, + { + "navn": "X10-knappen-ikke-bundet-til-spoergsmaalet", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "vist = ind; nonce = ny", + "vist = ind" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5e" + }, + { + "navn": "X11-menuens-knaptekst-i-boksen", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "menuKnap == \"Allow… (confirm with Touch ID)\" ? \"Allow (Touch ID)\" : menuKnap", + "menuKnap" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "2b" + }, + { + "navn": "X12-boksen-paastaar-hele-teksten", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "let helVist = hel.count <= BOKS_MAX_TEGN", + "let helVist = true" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "2c" + }, + { + "navn": "X13-agentens-navn-uvasket", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "\"\\(renTekst(v.klient ?? \"An agent\")) needs you\"", + "\"\\(v.klient ?? \"An agent\") needs you\"" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "2g" } ] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e42efd29..f618d67c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,6 +81,11 @@ jobs: - name: Usynlige tegn i programnavne run: node test/usynlige-navne.mjs + # 9/10: boksen i hjoernet - indhold, skaerm og Touch ID-vejen. Kompilerer + # Tekst.swift for sig og laeser ikonets --dump-question; starter aldrig ikonet. + - name: Boksen i hjoernet + run: node test/ikon-boks.mjs + # 7/10 (panel R12, Opus): pluginnet skal pege paa PUBLICERET - den version npm # serverer. Flettes en gren uden at sync-tal.py har koert efter en udgivelse, # bliver main roed her, og release.sh nægter at udgive. diff --git a/CHANGELOG.md b/CHANGELOG.md index e6dc85bd..87dbbfd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,13 @@ time is input activity, not proof that someone saw the question. **A sound for each new question.** Each new question plays one sound - not again if the same question is sent twice, and not when it expires. It can be switched off in the icon's menu. (`test/ikon-lyd.mjs`) +**A box in the corner of the screen you are working on.** While an agent works, +a box in the top-right corner shows which agents are working, in which app and +what they are doing - on the screen with the window you are using, not the one +the pointer is on, and it follows you between screens. When a question waits, it +turns orange and shows the whole question with the menu's own buttons: +`Allow (Touch ID)` and `Deny`. Allowing still asks for Touch ID every time, and a +question longer than 280 characters is answered in the menu. (`test/ikon-boks.mjs`) **WhatsApp by its name.** WhatsApp's name starts with an invisible character (U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: starting it in the background was refused as an unknown app, and so was every diff --git a/README.md b/README.md index 8de3d9da..2e34bda0 100644 --- a/README.md +++ b/README.md @@ -343,20 +343,32 @@ at the same time; nothing is serialised that does not have to be. ## The menu bar icon -While an agent is running, a small icon sits in the menu bar. It is the only -thing this product puts on your screen, and it never takes focus. +While an agent is running, a small icon sits in the menu bar, and while one is +working, a small box sits in the top-right corner of your screen. Those two are +all this product puts on your screen, and neither ever takes focus. - **The dropdown lists every agent that is running** - which client, and what it is doing right now. Click one to open a live window that follows it. The text says *what* it did (`Type 42 characters`, `Press an element in Finder`), never what was typed: the characters are not in the status file, not in the log, and not in the icon. +- **The box shows what is happening, where you are working.** It sits in the + top-right corner of the screen with the window you are using - not the one the + pointer happens to be on - and follows you when you switch screens. It lists + which agents are working, in which app, and what they are doing now. It never + takes the keyboard, and disappears half a minute after the work stops. You can switch it off in the icon's menu. - **A question that needs you turns the icon orange.** In background mode the server used to refuse anything that needed a human, because a dialog takes the screen. Now it waits for you instead: the question sits in the icon until you answer it, and the agent is told nothing happened until you do. -- **Allowing is deliberate.** `Allow…` lives in a submenu, never one click in the - main menu, and it asks for Touch ID (or your Mac's password) every time. The +- **The box turns orange too, with the whole question.** It shows who is asking + and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` + for something you do yourself). A question longer than 280 characters is only + answered in the menu, where all of it is shown: a yes has to cover everything + you saw. +- **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one + click in the main menu; in the box it is a button. Both ask for Touch ID (or your + Mac's password) every time. The answer travels back down the same socket connection the question came in on, bound to a one-time number with a deadline. A late answer, a different number, or a yes without your fingerprint is a no. diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index 3b20d9a2..ef8fe081 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -1,4 +1,5 @@ import Foundation +import CoreGraphics // Tekst til menuen og Touch ID-arket. Egen fil, saa test/ombryd.mjs kan // kompilere den direkte og maale at intet tegn falder ud (29/9). @@ -19,13 +20,76 @@ func kort(_ s: String, _ n: Int) -> String { return r.count > n ? "\(r.prefix(n))…" : r } -/// Boksen paa skaermen mens et spoergsmaal venter (30/9, live-proeven). -/// ⛔ MAALT: fire skaerm-laan udloeb uden svar, ogsaa mens Gustav holdt oeje. Ikonet -/// skiftede korrekt 21 -> 1, men boksen sagde kun «N working» og stod paa en -/// anden skaerm. Kun tekst - boksen faar aldrig en knap, der kan give et ja. -func ventendeBoks(antal: Int, tekst: String) -> [String] { - [antal == 1 ? "Needs you: click the orange menu bar icon" : "\(antal) questions: click the orange menu bar icon", - kort(tekst, 60)] +// MARK: - Boksen i hjoernet (9/10) +// +// ⛔ Gustav 9/10: «hver gang den bliver aktiv, er det en flydende komponent i hoejre +// hjoerne af skaermen, saa man kan se hvad der sker, naar de koerer» - «saa kan +// jeg ogsaa goere hvad du beder mig om». MAALT samme dag under F1: et spoergsmaal +// udloeb, fordi boksen stod i hjoernet af den ANDEN skaerm (x=4794 paa en +// ultrabred skaerm, musen var der) og kun sagde «Needs you: click the orange menu +// bar icon». Nu: den skaerm mennesket arbejder paa, hvad hver agent goer, og +// spoergsmaalet HELT med menuens egne knapper. +// +// ⛔ Regelaendring (Gustav 9/10, «1 ja»; R9 kraevede hans udtrykkelige ja): boksen +// maa have «Allow». Det er den samme handling som menuens - Touch ID hver gang, +// samme engangsnummer - og den vises KUN naar hele teksten staar i boksen: et ja +// skal daekke alt hvad mennesket saa. Laengere spoergsmaal godkendes i menuen. + +/// Saa mange tegn kan boksen vise HELT, ombrudt. +let BOKS_MAX_TEGN = 280 +let BOKS_BREDDE_TEGN = 48 + +struct BoksIndhold: Equatable { + let titel: String + let orange: Bool + let linjer: [String] + let knapper: [String] +} + +/// Menuens knap -> boksens. Kun etiketten er kortere; handlingen er den samme. +func boksKnap(_ menuKnap: String) -> String { + menuKnap == "Allow… (confirm with Touch ID)" ? "Allow (Touch ID)" : menuKnap +} + +/// `arbejder`: dem der arbejder nu (navn, hvilket program, hvad de goer). +/// `venter`: det foerste aabne spoergsmaal og menuens knapper for det. +func boksIndhold(arbejder: [(navn: String, maal: String?, nu: String)], tilsluttede: Int, + venter: (antal: Int, klient: String?, tekst: String, menuKnapper: [String])?) -> BoksIndhold { + if let v = venter { + let hel = renTekst(v.tekst) + let helVist = hel.count <= BOKS_MAX_TEGN + var linjer = helVist ? ombryd(hel, bredde: BOKS_BREDDE_TEGN) + : ombryd(String(hel.prefix(120)) + "…", bredde: BOKS_BREDDE_TEGN) + + ["(\(hel.count) characters - the whole text is in the menu bar icon)"] + if v.antal > 1 { linjer.append("+\(v.antal - 1) more in the menu bar icon") } + let knapper = v.menuKnapper + .filter { helVist || $0 != "Allow… (confirm with Touch ID)" } + .map(boksKnap) + return BoksIndhold(titel: "\(renTekst(v.klient ?? "An agent")) needs you", orange: true, linjer: linjer, knapper: knapper) + } + var linjer: [String] = [] + for a in arbejder.prefix(3) { + linjer.append("● " + renTekst(a.navn) + (a.maal.map { " · " + renTekst($0) } ?? "")) + linjer.append(" " + kort(a.nu, 60)) + } + if arbejder.count > 3 { linjer.append("+\(arbejder.count - 3) more working") } + let hale = tilsluttede > arbejder.count ? " · \(tilsluttede) connected" : "" + let titel = (arbejder.count == 1 ? "Computer MCP - 1 agent working" : "Computer MCP - \(arbejder.count) agents working") + hale + return BoksIndhold(titel: titel, orange: false, linjer: linjer, knapper: arbejder.isEmpty ? [] : ["Follow"]) +} + +/// Hvilken skaerm arbejder mennesket paa? Den med det forreste vindue; ellers den +/// musen er paa; ellers den foerste. Rammerne er i Cocoa-koordinater. +func boksSkaerm(forrestVindue: CGRect?, mus: CGPoint, skaerme: [CGRect]) -> Int { + if let v = forrestVindue, let i = skaerme.firstIndex(where: { $0.contains(CGPoint(x: v.midX, y: v.midY)) }) { return i } + if let i = skaerme.firstIndex(where: { $0.contains(mus) }) { return i } + return 0 +} + +/// CGWindowList maaler fra hovedskaermens OEVERSTE venstre hjoerne med y nedad; +/// NSScreen fra det NEDERSTE med y opad. +func cocoaRamme(_ cg: CGRect, hovedHoejde: CGFloat) -> CGRect { + CGRect(x: cg.minX, y: hovedHoejde - cg.maxY, width: cg.width, height: cg.height) } /// Ombryder teksten i linjer, saa HELE den kan laeses i menuen (29/9). diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index f4a76092..e27b25d2 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -321,13 +321,23 @@ final class Boks: NSPanel { override var canBecomeKey: Bool { false } override var canBecomeMain: Bool { false } - let linje1 = NSTextField(labelWithString: "") - let linje2 = NSTextField(labelWithString: "") - let knap = NSButton(title: "Follow", target: nil, action: nil) + let bredde: CGFloat + let titel = NSTextField(labelWithString: "") + let tekst = NSTextField(wrappingLabelWithString: "") + let knapper = NSStackView() let vaelger = NSPopUpButton(frame: .zero, pullsDown: false) + let stak = NSStackView() var valgt: String? = nil - - init(bredde: CGFloat = 340) { + /// Det spoergsmaal knapperne svarer paa - sat i SAMME opdatering som teksten, + /// saa et klik altid gaelder det mennesket saa. + private(set) var nonce: String? = nil + private var vist: BoksIndhold? = nil + /// Den skaerm boksen sidst blev sat paa. + private(set) var placeretPaa: CGRect? = nil + var knapTrykket: (String) -> Void = { _ in } + + init(bredde: CGFloat = 360) { + self.bredde = bredde super.init(contentRect: NSRect(x: 0, y: 0, width: bredde, height: 78), styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false) @@ -341,6 +351,8 @@ final class Boks: NSPanel { backgroundColor = .clear isOpaque = false hasShadow = true + // Boksen er til mennesket, ikke til agenternes skaermbilleder. + sharingType = .none let baggrund = NSVisualEffectView(frame: contentView!.bounds) baggrund.autoresizingMask = [.width, .height] @@ -351,63 +363,97 @@ final class Boks: NSPanel { baggrund.layer?.masksToBounds = true contentView?.addSubview(baggrund) - linje1.font = .systemFont(ofSize: 12, weight: .semibold) - linje1.frame = NSRect(x: 12, y: 50, width: bredde - 24, height: 16) - linje2.font = .monospacedSystemFont(ofSize: 11, weight: .regular) - linje2.textColor = .secondaryLabelColor - linje2.frame = NSRect(x: 12, y: 30, width: bredde - 24, height: 16) - linje2.lineBreakMode = .byTruncatingTail - knap.frame = NSRect(x: bredde - 92, y: 6, width: 80, height: 20) - knap.bezelStyle = .rounded - knap.controlSize = .small - knap.font = .systemFont(ofSize: 11) - vaelger.frame = NSRect(x: 8, y: 5, width: bredde - 108, height: 22) + titel.font = .systemFont(ofSize: 12, weight: .semibold) + tekst.font = .monospacedSystemFont(ofSize: 11, weight: .regular) + tekst.textColor = .labelColor + tekst.preferredMaxLayoutWidth = bredde - 24 + tekst.maximumNumberOfLines = 0 vaelger.controlSize = .small vaelger.font = .systemFont(ofSize: 11) - for v in [linje1, linje2, knap, vaelger] { baggrund.addSubview(v) } + knapper.orientation = .horizontal + knapper.spacing = 8 + stak.orientation = .vertical + stak.alignment = .leading + stak.spacing = 6 + stak.edgeInsets = NSEdgeInsets(top: 10, left: 12, bottom: 10, right: 12) + stak.translatesAutoresizingMaskIntoConstraints = false + for v in [titel, tekst, knapper] as [NSView] { stak.addArrangedSubview(v) } + baggrund.addSubview(stak) + NSLayoutConstraint.activate([ + stak.leadingAnchor.constraint(equalTo: baggrund.leadingAnchor), + stak.trailingAnchor.constraint(equalTo: baggrund.trailingAnchor), + stak.topAnchor.constraint(equalTo: baggrund.topAnchor), + tekst.widthAnchor.constraint(equalToConstant: bredde - 24), + ]) } - /// Oeverst til hoejre paa den skaerm musen er paa, under menulinjen. + /// Oeverst til hoejre paa den skaerm mennesket arbejder paa: den med det + /// forreste vindue, ellers den med musen (boksSkaerm i Tekst.swift). func placer() { - let skaerm = NSScreen.screens.first { NSMouseInRect(NSEvent.mouseLocation, $0.frame, false) } ?? NSScreen.main - guard let f = skaerm?.visibleFrame else { return } + let skaerme = NSScreen.screens + guard !skaerme.isEmpty else { return } + let i = boksSkaerm(forrestVindue: forrestVindue(), mus: NSEvent.mouseLocation, skaerme: skaerme.map { $0.frame }) + let f = skaerme[i].visibleFrame setFrameTopLeftPoint(NSPoint(x: f.maxX - frame.width - 16, y: f.maxY - 12)) + placeretPaa = skaerme[i].frame } - func opdater(_ sessioner: [Session], tilsluttede: Int = 0, venter: (Int, String)? = nil) { - if let (antal, tekst) = venter { - let l = ventendeBoks(antal: antal, tekst: tekst) - vaelger.isHidden = true - linje1.textColor = .systemOrange - linje1.stringValue = l[0] - linje2.stringValue = l[1] - return - } - linje1.textColor = .labelColor - let flere = sessioner.count > 1 - vaelger.isHidden = !flere - if flere { + /// Er mennesket gaaet over paa en anden skaerm, siden boksen blev sat? + func skalFlyttes() -> Bool { + let skaerme = NSScreen.screens + guard !skaerme.isEmpty else { return false } + let i = boksSkaerm(forrestVindue: forrestVindue(), mus: NSEvent.mouseLocation, skaerme: skaerme.map { $0.frame }) + return placeretPaa != skaerme[i].frame + } + + func vis(_ ind: BoksIndhold, nonce ny: String?, sessioner: [Session]) { + if ind == vist && ny == nonce { return } + vist = ind; nonce = ny + titel.stringValue = ind.titel + titel.textColor = ind.orange ? .systemOrange : .labelColor + tekst.stringValue = ind.linjer.joined(separator: "\n") + for v in knapper.arrangedSubviews { knapper.removeArrangedSubview(v); v.removeFromSuperview() } + // Flere agenter: vaelgeren bestemmer hvem «Follow» foelger. + if !ind.orange && sessioner.count > 1 { let navne = sessioner.map { navn($0) } - if vaelger.itemTitles != navne { - vaelger.removeAllItems(); vaelger.addItems(withTitles: navne) - } + if vaelger.itemTitles != navne { vaelger.removeAllItems(); vaelger.addItems(withTitles: navne) } if let v = valgt, let i = sessioner.firstIndex(where: { $0.session == v }) { vaelger.selectItem(at: i) } - valgt = sessioner[max(0, vaelger.indexOfSelectedItem)].session - } else { - valgt = sessioner.first?.session + knapper.addArrangedSubview(vaelger) + } + if !ind.orange { + let i = vaelger.indexOfSelectedItem + valgt = (sessioner.count > 1 && sessioner.indices.contains(i)) ? sessioner[i].session : sessioner.first?.session + } + for k in ind.knapper { + let b = NSButton(title: k, target: self, action: #selector(tryk(_:))) + b.bezelStyle = .rounded + b.controlSize = .small + b.font = .systemFont(ofSize: 11) + knapper.addArrangedSubview(b) + } + knapper.isHidden = knapper.arrangedSubviews.isEmpty + stak.layoutSubtreeIfNeeded() + let hoejde = ceil(stak.fittingSize.height) + let top = frame.maxY + setContentSize(NSSize(width: bredde, height: hoejde)) + setFrameTopLeftPoint(NSPoint(x: frame.minX, y: top)) + } + + @objc func tryk(_ b: NSButton) { knapTrykket(b.title) } +} + +/// Det forreste programs forreste almindelige vindue, i Cocoa-koordinater - eller nil. +func forrestVindue() -> CGRect? { + guard let pid = NSWorkspace.shared.frontmostApplication?.processIdentifier, + let hovedHoejde = NSScreen.screens.first?.frame.height, + let liste = CGWindowListCopyWindowInfo([.optionOnScreenOnly, .excludeDesktopElements], kCGNullWindowID) as? [[String: Any]] + else { return nil } + for w in liste where (w[kCGWindowOwnerPID as String] as? Int32) == pid && (w[kCGWindowLayer as String] as? Int) == 0 { + if let d = w[kCGWindowBounds as String] as? NSDictionary, let r = CGRect(dictionaryRepresentation: d) { + return cocoaRamme(r, hovedHoejde: hovedHoejde) } - let s = sessioner.first { $0.session == valgt } ?? sessioner.first - guard let s else { return } - // ⛔ Gustav 23/9: «der skal kun vaere det antal agenter, som der er live». - // Maalt samme dag: 15 servere koerte, 0 lavede noget. Et tal der - // blander «tilsluttet» og «arbejder» siger ingenting. Boksen viser - // dem der ARBEJDER, og naevner resten som tilsluttede. - let hale = tilsluttede > sessioner.count ? " · \(tilsluttede) connected" : "" - linje1.stringValue = (flere ? "Computer MCP - \(sessioner.count) working" : "Computer MCP - \(navn(s))") + hale - if let n = s.now { linje2.stringValue = "> " + n.text } - else if let sidste = s.recent.last { linje2.stringValue = "idle - last: \(sidste.text) (\(siden(sidste.ts)))" } - else { linje2.stringValue = "idle" } } + return nil } // MARK: - Spoergsmaalets undermenu som ren tekst (29/9) @@ -476,7 +522,12 @@ if CommandLine.arguments.contains("--dump-question") { let m = spoergsmaalMenu(s, aktivtAndetLaan: aktivtAndetLaan) var ud: [String: Any] = ["title": m.titel, "header": m.overskrift, "text": m.tekst, "facts": m.fakta, "buttons": m.knapper, "touchId": touchIdTekst(Anmodning(s, fd: -1)), - "box": ventendeBoks(antal: 1, tekst: s.text)] + "box": { () -> [String: Any] in + // Boksen i hjoernet for samme spoergsmaal - samme funktion som den rigtige boks. + let b = boksIndhold(arbejder: [], tilsluttede: 0, + venter: (antal: 1, klient: s.client, tekst: s.text, menuKnapper: m.knapper)) + return ["title": b.titel, "orange": b.orange, "lines": b.linjer, "buttons": b.knapper] + }()] if let v = m.ventetekst { ud["waitingForLoan"] = v } if s.kind == "screen" { ud["whileLent"] = laanLinjer(klient: s.client, til: Date().addingTimeInterval(Double(max(1, min(15, s.minutes ?? 10))) * 60)) } let data = try! JSONSerialization.data(withJSONObject: ud, options: [.prettyPrinted, .sortedKeys]) @@ -613,10 +664,9 @@ final class Ikon: NSObject, NSMenuDelegate { var tomSiden: Date? = nil lazy var boks: Boks = { let b = Boks() - b.knap.target = self - b.knap.action = #selector(foelgFraBoks) b.vaelger.target = self b.vaelger.action = #selector(skiftIBoks) + b.knapTrykket = { [weak self] knap in self?.boksKnapTrykket(knap) } return b }() var boksSlaaetFra: Bool { @@ -635,6 +685,11 @@ final class Ikon: NSObject, NSMenuDelegate { item.menu = menu let t = Timer(timeInterval: 1.0, repeats: true) { [weak self] _ in self?.tik() } RunLoop.main.add(t, forMode: .common) + // En skaerm sat i eller taget ud: boksen hen paa en skaerm der findes (9/10). + NotificationCenter.default.addObserver(forName: NSApplication.didChangeScreenParametersNotification, + object: nil, queue: .main) { [weak self] _ in + if self?.boks.isVisible == true { self?.boks.placer() } + } tik() } @@ -662,10 +717,20 @@ final class Ikon: NSObject, NSMenuDelegate { if s.isEmpty || boksSlaaetFra || !arbejder { if boks.isVisible { boks.orderOut(nil) } } else { - boks.opdater(s.filter { $0.now != nil || (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 }, - tilsluttede: s.count, - venter: aabne.first.map { (aabne.count, $0.s.text) }) + let aktive = s.filter { $0.now != nil || (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 } + let foerste = aabne.first + let venter = foerste.map { a in + (antal: aabne.count, klient: a.s.client, tekst: a.s.text, + menuKnapper: spoergsmaalMenu(a.s, aktivtAndetLaan: andetLaan(a)).knapper) + } + let arbejdende = aktive.map { sess in + (navn: navn(sess), maal: senesteMaal(sess), + nu: sess.now.map { $0.text } ?? sess.recent.last.map { "idle - last: \($0.text) (\(siden($0.ts)))" } ?? "idle") + } + boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter), + nonce: foerste?.s.nonce, sessioner: aktive) if !boks.isVisible { boks.placer(); boks.orderFrontRegardless() } + else if boks.skalFlyttes() { boks.placer() } } if s.isEmpty && anmodninger.isEmpty { if tomSiden == nil { tomSiden = Date() } @@ -698,9 +763,7 @@ final class Ikon: NSObject, NSMenuDelegate { // Teksten kommer fra spoergsmaalMenu - den samme som --dump-question. // Skaerm-koe (2/10): et ANDET aktivt laan gatér «Allow» ud af denne // anmodnings egen undermenu - hun staar i koen, serveren venter allerede. - let andetLaan: (klient: String?, til: Date)? = - (a.s.kind == "screen" && aktivtLaan != nil && aktivtLaan !== a) ? (aktivtLaan!.s.client, laanTil!) : nil - let mm = spoergsmaalMenu(a.s, aktivtAndetLaan: andetLaan) + let mm = spoergsmaalMenu(a.s, aktivtAndetLaan: andetLaan(a)) let i = NSMenuItem(title: mm.titel, action: nil, keyEquivalent: "") let sub = NSMenu() // ⛔ HELE teksten, ombrudt, over knapperne (29/9, panelet): et ja @@ -801,7 +864,7 @@ final class Ikon: NSObject, NSMenuDelegate { @objc func skiftIBoks() { let s = laesSessioner() let i = boks.vaelger.indexOfSelectedItem - if i >= 0 && i < s.count { boks.valgt = s[i].session; boks.opdater(s) } + if i >= 0 && i < s.count { boks.valgt = s[i].session } } @objc func skiftBoks() { @@ -809,11 +872,6 @@ final class Ikon: NSObject, NSMenuDelegate { tik() } - func find(_ sender: NSMenuItem) -> Anmodning? { - guard let n = sender.representedObject as? String else { return nil } - return anmodninger.first { $0.s.nonce == n && !$0.besvaret } - } - /// ⛔ MAALING, ikke vagt (22/9): sikkerhedskonsulenten foreslog at afvise /// klik der ikke kommer fra hardware. Hvad et AEGTE klik i en statusmenu /// baerer af kilde-felter, er umaalt - en vagt bygget paa et gaet kunne @@ -836,9 +894,37 @@ final class Ikon: NSObject, NSMenuDelegate { else { FileManager.default.createFile(atPath: sti, contents: linje.data(using: .utf8), attributes: [.posixPermissions: 0o600]) } } - @objc func tillad(_ sender: NSMenuItem) { - noterKilde("allow") - guard let a = find(sender) else { return } + /// Et ANDET skaerm-laan der allerede er aktivt (skaerm-koe 2/10) - menuen og boksen. + func andetLaan(_ a: Anmodning) -> (klient: String?, til: Date)? { + (a.s.kind == "screen" && aktivtLaan != nil && aktivtLaan !== a) ? (aktivtLaan!.s.client, laanTil!) : nil + } + + func aaben(_ nonce: String?) -> Anmodning? { + guard let n = nonce else { return nil } + return anmodninger.first { $0.s.nonce == n && !$0.besvaret } + } + + /// Boksens knapper (9/10): samme handlinger som menuens - Allow gaar gennem + /// tilladNonce og dermed Touch ID. Knappen svarer paa det spoergsmaal boksen viste. + func boksKnapTrykket(_ knap: String) { + let n = boks.nonce + switch knap { + case "Follow": foelgFraBoks() + case "Allow (Touch ID)": tilladNonce(n, kilde: "allow-box") + case "Done — I did it": gjortNonce(n, kilde: "done-box") + case "Take me there": hentFremNonce(n) + case "Deny", "I won't do this": afvisNonce(n, kilde: "deny-box") + default: break + } + } + + @objc func tillad(_ sender: NSMenuItem) { tilladNonce(sender.representedObject as? String, kilde: "allow") } + + func tilladNonce(_ nonce: String?, kilde: String) { + noterKilde(kilde) + guard let a = aaben(nonce) else { return } + // Et ja i boksen kraever, at boksen viste HELE teksten (som menuen goer). + if kilde == "allow-box" && renTekst(a.s.text).count > BOKS_MAX_TEGN { return } bekraeftMenneske(a) { [weak self] ok in // Et mislykket Touch ID er et nej, ikke et «proev igen» agenten kan vente paa. if ok && a.s.kind == "screen" { @@ -873,23 +959,29 @@ final class Ikon: NSObject, NSMenuDelegate { } /// «Done» paa et goer-selv-spoergsmaal: et signal, ikke et samtykke. - @objc func gjort(_ sender: NSMenuItem) { - noterKilde("done") - guard let a = find(sender), a.s.kind == "goer-selv" else { return } + @objc func gjort(_ sender: NSMenuItem) { gjortNonce(sender.representedObject as? String, kilde: "done") } + + func gjortNonce(_ nonce: String?, kilde: String) { + noterKilde(kilde) + guard let a = aaben(nonce), a.s.kind == "goer-selv" else { return } a.svar(ok: true, verified: "done") anmodninger.removeAll { $0 === a } tik() } /// «Take me there»: MENNESKETS klik henter programmet frem - ikke agentens. - @objc func hentFrem(_ sender: NSMenuItem) { - guard let a = find(sender), let b = a.s.targetBundle else { return } + @objc func hentFrem(_ sender: NSMenuItem) { hentFremNonce(sender.representedObject as? String) } + + func hentFremNonce(_ nonce: String?) { + guard let a = aaben(nonce), let b = a.s.targetBundle else { return } NSRunningApplication.runningApplications(withBundleIdentifier: b).first?.activate(options: []) } - @objc func afvis(_ sender: NSMenuItem) { - noterKilde("deny") - guard let a = find(sender) else { return } + @objc func afvis(_ sender: NSMenuItem) { afvisNonce(sender.representedObject as? String, kilde: "deny") } + + func afvisNonce(_ nonce: String?, kilde: String) { + noterKilde(kilde) + guard let a = aaben(nonce) else { return } a.svar(ok: false) anmodninger.removeAll { $0 === a } tik() diff --git a/mcp-server/README.md b/mcp-server/README.md index f105c911..25ba5e5c 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -341,20 +341,32 @@ at the same time; nothing is serialised that does not have to be. ## The menu bar icon -While an agent is running, a small icon sits in the menu bar. It is the only -thing this product puts on your screen, and it never takes focus. +While an agent is running, a small icon sits in the menu bar, and while one is +working, a small box sits in the top-right corner of your screen. Those two are +all this product puts on your screen, and neither ever takes focus. - **The dropdown lists every agent that is running** - which client, and what it is doing right now. Click one to open a live window that follows it. The text says *what* it did (`Type 42 characters`, `Press an element in Finder`), never what was typed: the characters are not in the status file, not in the log, and not in the icon. +- **The box shows what is happening, where you are working.** It sits in the + top-right corner of the screen with the window you are using - not the one the + pointer happens to be on - and follows you when you switch screens. It lists + which agents are working, in which app, and what they are doing now. It never + takes the keyboard, and disappears half a minute after the work stops. You can switch it off in the icon's menu. - **A question that needs you turns the icon orange.** In background mode the server used to refuse anything that needed a human, because a dialog takes the screen. Now it waits for you instead: the question sits in the icon until you answer it, and the agent is told nothing happened until you do. -- **Allowing is deliberate.** `Allow…` lives in a submenu, never one click in the - main menu, and it asks for Touch ID (or your Mac's password) every time. The +- **The box turns orange too, with the whole question.** It shows who is asking + and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` + for something you do yourself). A question longer than 280 characters is only + answered in the menu, where all of it is shown: a yes has to cover everything + you saw. +- **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one + click in the main menu; in the box it is a button. Both ask for Touch ID (or your + Mac's password) every time. The answer travels back down the same socket connection the question came in on, bound to a one-time number with a deadline. A late answer, a different number, or a yes without your fingerprint is a no. diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs new file mode 100644 index 00000000..0cd487b7 --- /dev/null +++ b/test/ikon-boks.mjs @@ -0,0 +1,123 @@ +// IKON-BOKS: boksen i hjoernet viser hvad agenterne goer, staar paa den skaerm +// mennesket arbejder paa, og et spoergsmaal kan besvares i den - med Touch ID. +// +// ⛔ 9/10 (F1 paa Gustavs Mac): et spoergsmaal udloeb, fordi boksen stod i hjoernet af +// den ANDEN skaerm (x=4794) og kun sagde «Needs you: click the orange menu bar icon». +// Gustav: «flydende komponent i hoejre hjoerne ... saa man kan se hvad der sker» og +// «saa kan jeg ogsaa goere hvad du beder mig om» (+ «1 ja»: Allow maa staa i boksen). +// +// Proeven starter ALDRIG ikonet og viser intet: den kompilerer Tekst.swift for sig, +// laeser det rigtige ikons --dump-question, og binder ikonets kode til reglerne. +import { execFileSync } from 'node:child_process'; +import { mkdtempSync, writeFileSync, readFileSync, existsSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const KILDE = join(ROOT, 'helper', 'Sources', 'cmcp-status'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; + +// 1-3 · Tekst.swift for sig: indhold og valg af skaerm +const ARB = mkdtempSync(join(tmpdir(), 'cmcp-ikon-boks-')); +writeFileSync(join(ARB, 'main.swift'), `import Foundation +import CoreGraphics +struct Ag: Decodable { let navn: String; let maal: String?; let nu: String } +struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; let menuKnapper: [String] } +struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V? } +struct R: Decodable { let x: Double; let y: Double; let w: Double; let h: Double } +struct S: Decodable { let vindue: R?; let mus: [Double]; let skaerme: [R] } +struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R] } +let ind = try! JSONDecoder().decode(Ind.self, from: FileHandle.standardInput.readDataToEndOfFile()) +let r = { (a: R) in CGRect(x: a.x, y: a.y, width: a.w, height: a.h) } +let ud: [String: Any] = [ + "indhold": ind.indhold.map { i -> [String: Any] in + let b = boksIndhold(arbejder: i.arbejder.map { (navn: $0.navn, maal: $0.maal, nu: $0.nu) }, tilsluttede: i.tilsluttede, + venter: i.venter.map { (antal: $0.antal, klient: $0.klient, tekst: $0.tekst, menuKnapper: $0.menuKnapper) }) + return ["titel": b.titel, "orange": b.orange, "linjer": b.linjer, "knapper": b.knapper] }, + "skaerm": ind.skaerm.map { s in boksSkaerm(forrestVindue: s.vindue.map(r), mus: CGPoint(x: s.mus[0], y: s.mus[1]), skaerme: s.skaerme.map(r)) }, + "cocoa": ind.cocoa.map { c in let x = cocoaRamme(r(c), hovedHoejde: 1112); return [x.minX, x.minY, x.width, x.height] }, + "max": BOKS_MAX_TEGN] +FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) +`); +const BIN = join(ARB, 'boks'); +execFileSync('swiftc', [join(KILDE, 'Tekst.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 300000 }); +const ALLOW_MENU = 'Allow… (confirm with Touch ID)'; +const lang = 'Send the quarterly numbers to the board. '.repeat(8); // > 280 tegn +// Gustavs to skaerme: MacBook 1710x1112 forrest (hovedskaerm), ultrabred 3440x1440 til hoejre. +const MAC = { x: 0, y: 0, w: 1710, h: 1112 }, BRED = { x: 1710, y: -200, w: 3440, h: 1440 }; +const ind = { + indhold: [ + { arbejder: [{ navn: 'Claude · c753', maal: 'com.apple.Notes', nu: 'Press «Format» in Noter' }, { navn: 'Codex · 9f1', maal: null, nu: 'idle' }], tilsluttede: 12, venter: null }, + { arbejder: Array.from({ length: 5 }, (_, i) => ({ navn: `a${i}`, maal: null, nu: 'x' })), tilsluttede: 5, venter: null }, + { arbejder: [], tilsluttede: 3, venter: { antal: 1, klient: 'Claude', tekst: 'Press cmd+backspace in Noter', menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 3, venter: { antal: 3, klient: 'Claude', tekst: lang, menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: null, tekst: 'Type your password in Safari', menuKnapper: ['Take me there', 'Done — I did it', "I won't do this"] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Use your screen for 2 minutes', menuKnapper: ['Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude‮', tekst: 'x'.repeat(280), menuKnapper: [ALLOW_MENU, 'Deny'] } }, + ], + skaerm: [ + { vindue: { x: 1800, y: 100, w: 1400, h: 900 }, mus: [100, 100], skaerme: [MAC, BRED] }, // vinduet paa den brede, musen paa Mac'en + { vindue: { x: 100, y: 100, w: 800, h: 600 }, mus: [4000, 500], skaerme: [MAC, BRED] }, // omvendt + { vindue: null, mus: [4000, 500], skaerme: [MAC, BRED] }, // intet vindue: musen + { vindue: null, mus: [-5000, -5000], skaerme: [MAC, BRED] }, // intet: den foerste + { vindue: { x: 9000, y: 9000, w: 10, h: 10 }, mus: [4000, 500], skaerme: [MAC, BRED] }, // vindue uden for alle: musen + ], + cocoa: [{ x: 0, y: 0, w: 100, h: 50 }, { x: 1800, y: 34, w: 1200, h: 800 }], +}; +const s = JSON.parse(execFileSync(BIN, { input: JSON.stringify(ind), encoding: 'utf8' })); +const [n2, n5, q1, qLang, qSelv, qLaan, qGraense] = s.indhold; +check('1a to agenter: titlen siger hvor mange der arbejder, og hvor mange der er tilsluttet', n2.titel === 'Computer MCP - 2 agents working · 12 connected' && !n2.orange, n2.titel); +check('1b hver agent: navn, program og hvad den goer nu', n2.linjer[0] === '● Claude · c753 · com.apple.Notes' && n2.linjer[1].trim() === 'Press «Format» in Noter' && n2.linjer[2] === '● Codex · 9f1', JSON.stringify(n2.linjer)); +check('1c hoejst tre agenter, resten som et tal', n5.linjer.filter(l => l.startsWith('●')).length === 3 && n5.linjer.at(-1) === '+2 more working', JSON.stringify(n5.linjer)); +check('1d «Follow» naar nogen arbejder', JSON.stringify(n2.knapper) === '["Follow"]'); +check('2a et spoergsmaal: orange, hvem der spoerger, og HELE teksten', q1.orange && q1.titel === 'Claude needs you' && q1.linjer.join(' ') === 'Press cmd+backspace in Noter', JSON.stringify(q1)); +check('2b ...med menuens knapper: Allow (Touch ID) og Deny', JSON.stringify(q1.knapper) === '["Allow (Touch ID)","Deny"]', JSON.stringify(q1.knapper)); +check(`2c over ${s.max} tegn: ingen Allow i boksen, og den siger hvor hele teksten er`, + !qLang.knapper.includes('Allow (Touch ID)') && qLang.knapper.includes('Deny') + && qLang.linjer.some(l => /\(\d+ characters - the whole text is in the menu bar icon\)/.test(l)), JSON.stringify(qLang)); +check('2d flere spoergsmaal: boksen siger hvor mange flere', qLang.linjer.at(-1) === '+2 more in the menu bar icon', qLang.linjer.at(-1)); +check('2e goer-selv: menuens egne knapper, ingen Allow', JSON.stringify(qSelv.knapper) === JSON.stringify(['Take me there', 'Done — I did it', "I won't do this"]) && qSelv.titel === 'An agent needs you', JSON.stringify(qSelv)); +check('2f et laan i koe: kun Deny, som i menuen', JSON.stringify(qLaan.knapper) === '["Deny"]'); +check(`2g paa graensen (${s.max} tegn): Allow staar, intet tegn mangler, og usynlige tegn i navnet er vasket`, + qGraense.knapper.includes('Allow (Touch ID)') && qGraense.linjer.join('').length === 280 && !qGraense.titel.includes('‮'), qGraense.titel); +check('3a skaermen med det forreste vindue - ikke musens', s.skaerm[0] === 1 && s.skaerm[1] === 0, JSON.stringify(s.skaerm)); +check('3b intet vindue: musens skaerm; ingen af delene: den foerste', s.skaerm[2] === 1 && s.skaerm[3] === 0 && s.skaerm[4] === 1, JSON.stringify(s.skaerm)); +check('3c vinduets ramme omregnes fra oeverst-venstre til Cocoas nederst-venstre', + JSON.stringify(s.cocoa) === JSON.stringify([[0, 1062, 100, 50], [1800, 278, 1200, 800]]), JSON.stringify(s.cocoa)); + +// 4 · det rigtige ikon: --dump-question bygger boksen med samme funktion som den rigtige boks +const ikon = [join(ROOT, 'helper', '.build', 'release', 'cmcp-status'), join(ROOT, 'mcp-server', 'vendor', 'ComputerMCPStatus.app', 'Contents', 'MacOS', 'cmcp-status')].find(p => existsSync(p)); +if (!ikon) console.log('SPR. 4 intet bygget ikon'); +else { + const vis = (q) => JSON.parse(execFileSync(ikon, ['--dump-question'], { encoding: 'utf8', input: JSON.stringify({ nonce: 'n', session: 's', client: 'Claude', scope: 'If you allow it, this one action only.', target: 'com.apple.Notes', expires: 0, ...q }) })).box; + const b = vis({ text: 'Press cmd+backspace in Noter' }); + check('4a ikonet: spoergsmaalet i boksen med Allow (Touch ID) og Deny', b.title === 'Claude needs you' && JSON.stringify(b.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(b)); + const l = vis({ text: 'Use your screen for 2 minutes: F1', kind: 'screen', minutes: 2, simulateActiveLoan: { client: 'anden', minutesLeft: 3 } }); + check('4b ikonet: et andet laan er aktivt - boksen har kun Deny', JSON.stringify(l.buttons) === '["Deny"]', JSON.stringify(l)); +} + +// 5 · ikonets kode er bundet til reglerne +const m = readFileSync(join(KILDE, 'main.swift'), 'utf8'); +const krop = (start) => { const i = m.indexOf(start); return i < 0 ? '' : m.slice(i, m.indexOf('\n }\n', i)); }; +const knapKrop = krop('func boksKnapTrykket('); +check('5a boksens Allow er menuens tilladNonce - samme vej, med sit eget kildemaerke', + /case "Allow \(Touch ID\)": tilladNonce\(n, kilde: "allow-box"\)/.test(knapKrop), knapKrop.slice(0, 200)); +check('5b menuens Allow gaar samme vej', /@objc func tillad\(_ sender: NSMenuItem\) \{ tilladNonce\(sender\.representedObject as\? String, kilde: "allow"\) \}/.test(m)); +const tillad = krop('func tilladNonce('); +check('5c et ja kraever Touch ID: intet svar foer bekraeftMenneske, og et ja i boksen kun naar HELE teksten stod der', + /if kilde == "allow-box" && renTekst\(a\.s\.text\)\.count > BOKS_MAX_TEGN \{ return \}\n\s+bekraeftMenneske\(a\) \{/.test(tillad) + && !/svar\(ok: true|svarLaan/.test(tillad.slice(0, tillad.indexOf('bekraeftMenneske(a)'))), tillad.slice(0, 300)); +check('5d hver knap boksen kan vise, har en handling', ['Follow', 'Allow (Touch ID)', 'Done — I did it', 'Take me there', 'Deny', "I won't do this"] + .every(k => knapKrop.includes(`"${k}"`))); +check('5e knapperne svarer paa det spoergsmaal boksen viste (nonce saettes sammen med teksten)', /vist = ind; nonce = ny/.test(m) && /let n = boks\.nonce/.test(knapKrop)); +check('5f boksen faar menuens knapper for spoergsmaalet', /menuKnapper: spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)\.knapper/.test(m) + && /let mm = spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)/.test(m)); +check('5g placeringen: skaermen med det forreste vindue', /let i = boksSkaerm\(forrestVindue: forrestVindue\(\), mus: NSEvent\.mouseLocation, skaerme: skaerme\.map \{ \$0\.frame \}\)\n\s+let f = skaerme\[i\]\.visibleFrame/.test(m)); +check('5h flyttes med: ny skaerm-opsaetning, og naar mennesket skifter skaerm', /didChangeScreenParametersNotification[\s\S]{0,200}boks\.placer\(\)/.test(m) && /else if boks\.skalFlyttes\(\) \{ boks\.placer\(\) \}/.test(m)); +check('5i boksen tager aldrig tastaturet og er ikke med i agenternes skaermbilleder', + /override var canBecomeKey: Bool \{ false \}/.test(m) && /sharingType = \.none/.test(m) && /\.nonactivatingPanel/.test(m)); + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/ikon-menu.mjs b/test/ikon-menu.mjs index ba38e6fb..bec83294 100644 --- a/test/ikon-menu.mjs +++ b/test/ikon-menu.mjs @@ -56,9 +56,11 @@ check('3 ...Touch ID-arket siger laan, minutter og at det kan tages tilbage', /l check('3 ...og mens det gaelder: hvem, hvor laenge, og «Take the screen back now»', /chat is using your screen — 5 min left/.test(l.whileLent?.[0] || '') && l.whileLent?.[1] === 'Take the screen back now', JSON.stringify(l.whileLent)); // 3c (live-proeven 30/9): boksen paa skaermen skal SIGE at et spoergsmaal venter, og hvor. -const bx = vis({ text: 'Use your screen for 5 minutes: live-proeve', kind: 'screen', minutes: 5 }).box || []; -check('3c boksen siger at et spoergsmaal venter, og peger paa det orange ikon', /needs you/i.test(bx[0] || '') && /orange menu bar icon/.test(bx[0] || ''), JSON.stringify(bx)); -check('3c ...og hvad det gaelder', (bx[1] || '').startsWith('Use your screen for 5 minutes'), JSON.stringify(bx)); +// 9/10: boksen viser spoergsmaalet HELT og har menuens knapper (test/ikon-boks.mjs maaler resten). +const bx = vis({ text: 'Use your screen for 5 minutes: live-proeve', kind: 'screen', minutes: 5 }).box || {}; +check('3c boksen siger at et spoergsmaal venter, og hvem der spoerger', bx.orange === true && /needs you/i.test(bx.title || ''), JSON.stringify(bx)); +check('3c ...og hvad det gaelder, helt', (bx.lines || []).join(' ') === 'Use your screen for 5 minutes: live-proeve', JSON.stringify(bx)); +check('3c ...med Allow (Touch ID) og Deny', JSON.stringify(bx.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(bx)); check('3b laanet kan aldrig vaere over 15 minutter i ikonet', /for 15 minutes/.test(vis({ text: 'x', kind: 'screen', minutes: 99 }).touchId)); // 3d (skaerm-koe-panelet, 2/10): et ANDET laan er allerede aktivt - «Allow» udelades, diff --git a/test/run-all.sh b/test/run-all.sh index ddf7f8de..635c0f20 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -154,6 +154,8 @@ run "samtykke-tekst" "node test/samtykke-tekst.mjs" # ⛔ 29/9: Touch ID-arket klippede handlingen ved 80 tegn, tavst - et ja til noget ulaest. run "hele teksten i menuen" "node test/ombryd.mjs" run "lyd pr. spoergsmaal" "node test/ikon-lyd.mjs" +# ⛔ 9/10: boksen stod paa den anden skaerm og sagde kun «Needs you» - et spoergsmaal udloeb. +run "boksen i hjoernet" "node test/ikon-boks.mjs" # ⛔ 9/10: «\u200eWhatsApp» - app "WhatsApp" blev «ukendt maal» og afvist. run "usynlige navne" "node test/usynlige-navne.mjs" # ⛔ 29/9: goer-selv, skaerm-laanet og den fulde tekst var kun kompileret i ikonet, aldrig koert. From 9c8753c9919947ab57040b6d36d18031e9a9a0f4 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 10:54:44 +0200 Subject: [PATCH 107/132] fix(boks): R17 (Astra) - knappen baerer sit spoergsmaal, og seks overlevende mutanter lukket - Hver boksknap baerer sit eget engangsnummer; et klik fra en visning der er skiftet siden, goer intet (boksKnapTrykket afviser n != boks.nonce). - boksHjoerne og forrestVinduesRamme flyttet til Tekst.swift og proevet med adfaerd (hjoernet inde paa skaermen; det forreste PROGRAMS forreste lag-0-vindue). - Kroppene bundet helt: appOpslag (intet foer reglen), programURL (praecist filnavn, ellers HELE listen), tilladNonce (et nej er et nej), aaben (kun eget engangsnummer), placer (boksHjoerne), forrestVindue (forreste programs pid). - README/CHANGELOG: over 280 tegn er det Allow der kun findes i menuen (Deny/Done staar stadig i boksen). Proeve 5i lover ikke mere end koden viser. - Mutanter Y1-Y9 (Astras A17-A22 m.fl.) alle roede. 166 ankre entydige. ikon-boks 30/30, usynlige-navne 70/70, ikon-menu 19, resten groenne. Ikke med her: binding af maal + proces ved levering (Astra: 0.2.2, Opus R16: 0.3) - afgoeres i R17 med Opus' svar. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 108 +++++++++++++++++++++++++ CHANGELOG.md | 4 +- README.md | 6 +- helper/Sources/cmcp-status/Tekst.swift | 15 ++++ helper/Sources/cmcp-status/main.swift | 30 ++++--- mcp-server/README.md | 6 +- test/ikon-boks.mjs | 42 ++++++++-- test/usynlige-navne.mjs | 7 +- 8 files changed, 189 insertions(+), 29 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index ac6ad364..57dc78d6 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1898,5 +1898,113 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "2g" + }, + { + "navn": "Y1-tidlig-retur-foer-reglen", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + " let alle = allApps()\n switch Navne.vaelgApp(", + " let alle = allApps()\n if let a = alle.first(where: { Navne.noegle($0.localizedName ?? \"\") == Navne.noegle(hvad) }) { return (a, false) }\n switch Navne.vaelgApp(" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6a2" + }, + { + "navn": "Y2-foerste-program-paa-disken", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + " var fund: [URL] = []\n", + " if let f = (try? FileManager.default.contentsOfDirectory(atPath: mapper[0]))?.first(where: { $0.hasSuffix(\".app\") }) { return URL(fileURLWithPath: mapper[0]).appendingPathComponent(f) }\n var fund: [URL] = []\n" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6b" + }, + { + "navn": "Y3-nej-bliver-til-ja", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " } else {\n a.svar(ok: ok)\n }", + " } else {\n a.svar(ok: true)\n }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5c2" + }, + { + "navn": "Y4-spoergsmaal-uden-engangsnummer", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "return anmodninger.first { $0.s.nonce == n && !$0.besvaret }", + "return anmodninger.first { _ = n; return !$0.besvaret }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5c3" + }, + { + "navn": "Y5-boksen-uden-for-skaermen", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "CGPoint(x: synlig.maxX - bredde - 16, y: synlig.maxY - 12)", + "CGPoint(x: synlig.minX - bredde - 16, y: synlig.maxY - 12)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "3d" + }, + { + "navn": "Y6-et-andet-programs-vindue", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "(w[kCGWindowOwnerPID as String] as? NSNumber)?.int32Value == pid", + "(w[kCGWindowOwnerPID as String] as? NSNumber)?.int32Value != pid" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "3e" + }, + { + "navn": "Y7-menulinje-lag-som-vindue", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "\n && (w[kCGWindowLayer as String] as? NSNumber)?.intValue == 0", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "3e" + }, + { + "navn": "Y8-klik-fra-aeldre-visning", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "if knap != \"Follow\" && (n == nil || n != boks.nonce) { return }", + "_ = n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5e" + }, + { + "navn": "Y9-placering-uden-hjoernet", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "setFrameTopLeftPoint(boksHjoerne(synlig: f, bredde: frame.width))", + "setFrameTopLeftPoint(NSPoint(x: f.minX - 500, y: f.maxY))" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5g" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 87dbbfd1..ca0309c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,8 +28,8 @@ a box in the top-right corner shows which agents are working, in which app and what they are doing - on the screen with the window you are using, not the one the pointer is on, and it follows you between screens. When a question waits, it turns orange and shows the whole question with the menu's own buttons: -`Allow (Touch ID)` and `Deny`. Allowing still asks for Touch ID every time, and a -question longer than 280 characters is answered in the menu. (`test/ikon-boks.mjs`) +`Allow (Touch ID)` and `Deny`. Allowing still asks for Touch ID every time; for a +question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) **WhatsApp by its name.** WhatsApp's name starts with an invisible character (U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: starting it in the background was refused as an unknown app, and so was every diff --git a/README.md b/README.md index 2e34bda0..cc7c1e5b 100644 --- a/README.md +++ b/README.md @@ -363,9 +363,9 @@ all this product puts on your screen, and neither ever takes focus. answer it, and the agent is told nothing happened until you do. - **The box turns orange too, with the whole question.** It shows who is asking and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` - for something you do yourself). A question longer than 280 characters is only - answered in the menu, where all of it is shown: a yes has to cover everything - you saw. + for something you do yourself). For a question longer than 280 characters, + `Allow` is only in the menu, where all of it is shown: a yes has to cover + everything you saw. - **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one click in the main menu; in the box it is a button. Both ask for Touch ID (or your Mac's password) every time. The diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index ef8fe081..3edafabe 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -86,6 +86,21 @@ func boksSkaerm(forrestVindue: CGRect?, mus: CGPoint, skaerme: [CGRect]) -> Int return 0 } +/// Boksens oeverste venstre hjoerne: oeverst til hoejre i skaermens synlige del. +func boksHjoerne(synlig: CGRect, bredde: CGFloat) -> CGPoint { + CGPoint(x: synlig.maxX - bredde - 16, y: synlig.maxY - 12) +} + +/// Det forreste programs forreste ALMINDELIGE vindue (lag 0) i CGWindowList' liste, +/// som er ordnet forrest foerst. Rammen er i CGWindowList' koordinater. +func forrestVinduesRamme(_ liste: [[String: Any]], pid: Int32) -> CGRect? { + for w in liste where (w[kCGWindowOwnerPID as String] as? NSNumber)?.int32Value == pid + && (w[kCGWindowLayer as String] as? NSNumber)?.intValue == 0 { + if let d = w[kCGWindowBounds as String] as? NSDictionary, let r = CGRect(dictionaryRepresentation: d) { return r } + } + return nil +} + /// CGWindowList maaler fra hovedskaermens OEVERSTE venstre hjoerne med y nedad; /// NSScreen fra det NEDERSTE med y opad. func cocoaRamme(_ cg: CGRect, hovedHoejde: CGFloat) -> CGRect { diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index e27b25d2..f92f8d0e 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -334,7 +334,8 @@ final class Boks: NSPanel { private var vist: BoksIndhold? = nil /// Den skaerm boksen sidst blev sat paa. private(set) var placeretPaa: CGRect? = nil - var knapTrykket: (String) -> Void = { _ in } + /// (knappens titel, det spoergsmaal KNAPPEN blev lavet til) - R17 (Astra). + var knapTrykket: (String, String?) -> Void = { _, _ in } init(bredde: CGFloat = 360) { self.bredde = bredde @@ -394,7 +395,7 @@ final class Boks: NSPanel { guard !skaerme.isEmpty else { return } let i = boksSkaerm(forrestVindue: forrestVindue(), mus: NSEvent.mouseLocation, skaerme: skaerme.map { $0.frame }) let f = skaerme[i].visibleFrame - setFrameTopLeftPoint(NSPoint(x: f.maxX - frame.width - 16, y: f.maxY - 12)) + setFrameTopLeftPoint(boksHjoerne(synlig: f, bredde: frame.width)) placeretPaa = skaerme[i].frame } @@ -426,6 +427,8 @@ final class Boks: NSPanel { } for k in ind.knapper { let b = NSButton(title: k, target: self, action: #selector(tryk(_:))) + // Knappen baerer selv sit spoergsmaal - ikke boksens nuvaerende (R17, Astra). + b.identifier = NSUserInterfaceItemIdentifier("boks-" + (ny ?? "")) b.bezelStyle = .rounded b.controlSize = .small b.font = .systemFont(ofSize: 11) @@ -439,21 +442,20 @@ final class Boks: NSPanel { setFrameTopLeftPoint(NSPoint(x: frame.minX, y: top)) } - @objc func tryk(_ b: NSButton) { knapTrykket(b.title) } + @objc func tryk(_ b: NSButton) { + let id = b.identifier?.rawValue ?? "" + knapTrykket(b.title, id.count > 5 ? String(id.dropFirst(5)) : nil) + } } /// Det forreste programs forreste almindelige vindue, i Cocoa-koordinater - eller nil. func forrestVindue() -> CGRect? { guard let pid = NSWorkspace.shared.frontmostApplication?.processIdentifier, let hovedHoejde = NSScreen.screens.first?.frame.height, - let liste = CGWindowListCopyWindowInfo([.optionOnScreenOnly, .excludeDesktopElements], kCGNullWindowID) as? [[String: Any]] + let liste = CGWindowListCopyWindowInfo([.optionOnScreenOnly, .excludeDesktopElements], kCGNullWindowID) as? [[String: Any]], + let r = forrestVinduesRamme(liste, pid: pid) else { return nil } - for w in liste where (w[kCGWindowOwnerPID as String] as? Int32) == pid && (w[kCGWindowLayer as String] as? Int) == 0 { - if let d = w[kCGWindowBounds as String] as? NSDictionary, let r = CGRect(dictionaryRepresentation: d) { - return cocoaRamme(r, hovedHoejde: hovedHoejde) - } - } - return nil + return cocoaRamme(r, hovedHoejde: hovedHoejde) } // MARK: - Spoergsmaalets undermenu som ren tekst (29/9) @@ -666,7 +668,7 @@ final class Ikon: NSObject, NSMenuDelegate { let b = Boks() b.vaelger.target = self b.vaelger.action = #selector(skiftIBoks) - b.knapTrykket = { [weak self] knap in self?.boksKnapTrykket(knap) } + b.knapTrykket = { [weak self] knap, nonce in self?.boksKnapTrykket(knap, nonce: nonce) } return b }() var boksSlaaetFra: Bool { @@ -906,8 +908,10 @@ final class Ikon: NSObject, NSMenuDelegate { /// Boksens knapper (9/10): samme handlinger som menuens - Allow gaar gennem /// tilladNonce og dermed Touch ID. Knappen svarer paa det spoergsmaal boksen viste. - func boksKnapTrykket(_ knap: String) { - let n = boks.nonce + func boksKnapTrykket(_ knap: String, nonce n: String?) { + // Et klik fra en visning der er skiftet siden, goer intet (R17, Astra): knappens + // eget spoergsmaal skal vaere det boksen viser NU. + if knap != "Follow" && (n == nil || n != boks.nonce) { return } switch knap { case "Follow": foelgFraBoks() case "Allow (Touch ID)": tilladNonce(n, kilde: "allow-box") diff --git a/mcp-server/README.md b/mcp-server/README.md index 25ba5e5c..c4ea39b4 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -361,9 +361,9 @@ all this product puts on your screen, and neither ever takes focus. answer it, and the agent is told nothing happened until you do. - **The box turns orange too, with the whole question.** It shows who is asking and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` - for something you do yourself). A question longer than 280 characters is only - answered in the menu, where all of it is shown: a yes has to cover everything - you saw. + for something you do yourself). For a question longer than 280 characters, + `Allow` is only in the menu, where all of it is shown: a yes has to cover + everything you saw. - **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one click in the main menu; in the box it is a button. Both ask for Touch ID (or your Mac's password) every time. The diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 0cd487b7..f024f563 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -28,8 +28,13 @@ struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; le struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V? } struct R: Decodable { let x: Double; let y: Double; let w: Double; let h: Double } struct S: Decodable { let vindue: R?; let mus: [Double]; let skaerme: [R] } -struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R] } -let ind = try! JSONDecoder().decode(Ind.self, from: FileHandle.standardInput.readDataToEndOfFile()) +struct H: Decodable { let synlig: R; let bredde: Double } +struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R]; let hjoerne: [H] } +let raa = FileHandle.standardInput.readDataToEndOfFile() +let ind = try! JSONDecoder().decode(Ind.self, from: raa) +// CGWindowList-lister som macOS giver dem: NSNumber og NSDictionary (via JSONSerialization). +let raaJson = try! JSONSerialization.jsonObject(with: raa) as! [String: Any] +let lister = raaJson["vinduer"] as! [[String: Any]] let r = { (a: R) in CGRect(x: a.x, y: a.y, width: a.w, height: a.h) } let ud: [String: Any] = [ "indhold": ind.indhold.map { i -> [String: Any] in @@ -38,6 +43,11 @@ let ud: [String: Any] = [ return ["titel": b.titel, "orange": b.orange, "linjer": b.linjer, "knapper": b.knapper] }, "skaerm": ind.skaerm.map { s in boksSkaerm(forrestVindue: s.vindue.map(r), mus: CGPoint(x: s.mus[0], y: s.mus[1]), skaerme: s.skaerme.map(r)) }, "cocoa": ind.cocoa.map { c in let x = cocoaRamme(r(c), hovedHoejde: 1112); return [x.minX, x.minY, x.width, x.height] }, + "hjoerne": ind.hjoerne.map { h in let p = boksHjoerne(synlig: r(h.synlig), bredde: CGFloat(h.bredde)); return [p.x, p.y] }, + "vinduer": lister.map { l -> Any in + let pid = (l["pid"] as! NSNumber).int32Value + guard let v = forrestVinduesRamme(l["liste"] as! [[String: Any]], pid: pid) else { return NSNull() } + return [v.minX, v.minY, v.width, v.height] }, "max": BOKS_MAX_TEGN] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); @@ -65,6 +75,15 @@ const ind = { { vindue: { x: 9000, y: 9000, w: 10, h: 10 }, mus: [4000, 500], skaerme: [MAC, BRED] }, // vindue uden for alle: musen ], cocoa: [{ x: 0, y: 0, w: 100, h: 50 }, { x: 1800, y: 34, w: 1200, h: 800 }], + hjoerne: [{ synlig: { x: 0, y: 0, w: 1710, h: 1077 }, bredde: 360 }, { synlig: { x: 1710, y: -200, w: 3440, h: 1415 }, bredde: 360 }], + vinduer: (() => { + const v = (pid, lag, X) => ({ kCGWindowOwnerPID: pid, kCGWindowLayer: lag, kCGWindowBounds: { X, Y: 40, Width: 500, Height: 300 } }); + return [ + { pid: 7, liste: [v(5, 0, 10), v(7, 25, 20), v(7, 0, 30), v(7, 0, 40)] }, // menulinje-lag springes over; det forreste almindelige + { pid: 5, liste: [v(5, 0, 10), v(7, 0, 30)] }, + { pid: 9, liste: [v(5, 0, 10)] }, // det forreste program har intet vindue + ]; + })(), }; const s = JSON.parse(execFileSync(BIN, { input: JSON.stringify(ind), encoding: 'utf8' })); const [n2, n5, q1, qLang, qSelv, qLaan, qGraense] = s.indhold; @@ -84,6 +103,9 @@ check(`2g paa graensen (${s.max} tegn): Allow staar, intet tegn mangler, og usyn qGraense.knapper.includes('Allow (Touch ID)') && qGraense.linjer.join('').length === 280 && !qGraense.titel.includes('‮'), qGraense.titel); check('3a skaermen med det forreste vindue - ikke musens', s.skaerm[0] === 1 && s.skaerm[1] === 0, JSON.stringify(s.skaerm)); check('3b intet vindue: musens skaerm; ingen af delene: den foerste', s.skaerm[2] === 1 && s.skaerm[3] === 0 && s.skaerm[4] === 1, JSON.stringify(s.skaerm)); +check('3d boksen staar inde paa skaermen, oeverst til hoejre', JSON.stringify(s.hjoerne) === JSON.stringify([[1334, 1065], [4774, 1203]]), JSON.stringify(s.hjoerne)); +check('3e det forreste programs forreste almindelige vindue - ikke et andet programs, ikke et menulinje-lag', + JSON.stringify(s.vinduer) === JSON.stringify([[30, 40, 500, 300], [10, 40, 500, 300], null]), JSON.stringify(s.vinduer)); check('3c vinduets ramme omregnes fra oeverst-venstre til Cocoas nederst-venstre', JSON.stringify(s.cocoa) === JSON.stringify([[0, 1062, 100, 50], [1800, 278, 1200, 800]]), JSON.stringify(s.cocoa)); @@ -109,14 +131,24 @@ const tillad = krop('func tilladNonce('); check('5c et ja kraever Touch ID: intet svar foer bekraeftMenneske, og et ja i boksen kun naar HELE teksten stod der', /if kilde == "allow-box" && renTekst\(a\.s\.text\)\.count > BOKS_MAX_TEGN \{ return \}\n\s+bekraeftMenneske\(a\) \{/.test(tillad) && !/svar\(ok: true|svarLaan/.test(tillad.slice(0, tillad.indexOf('bekraeftMenneske(a)'))), tillad.slice(0, 300)); +check('5c2 svaret er Touch ID-svaret: et nej er et nej (aldrig svar(ok: true))', + /\} else \{\n\s+a\.svar\(ok: ok\)\n/.test(tillad) && !/svar\(ok: true/.test(tillad)); +check('5c3 et spoergsmaal findes kun paa sit eget engangsnummer', /func aaben\(_ nonce: String\?\) -> Anmodning\? \{\n\s+guard let n = nonce else \{ return nil \}\n\s+return anmodninger\.first \{ \$0\.s\.nonce == n && !\$0\.besvaret \}\n\s+\}/.test(m)); check('5d hver knap boksen kan vise, har en handling', ['Follow', 'Allow (Touch ID)', 'Done — I did it', 'Take me there', 'Deny', "I won't do this"] .every(k => knapKrop.includes(`"${k}"`))); -check('5e knapperne svarer paa det spoergsmaal boksen viste (nonce saettes sammen med teksten)', /vist = ind; nonce = ny/.test(m) && /let n = boks\.nonce/.test(knapKrop)); +check('5e hver knap baerer sit eget spoergsmaal, og et klik fra en aeldre visning goer intet (R17, Astra)', + /vist = ind; nonce = ny/.test(m) + && /b\.identifier = NSUserInterfaceItemIdentifier\("boks-" \+ \(ny \?\? ""\)\)/.test(m) + && /knapTrykket\(b\.title, id\.count > 5 \? String\(id\.dropFirst\(5\)\) : nil\)/.test(m) + && /func boksKnapTrykket\(_ knap: String, nonce n: String\?\) \{\n(\s+\/\/[^\n]*\n)*\s+if knap != "Follow" && \(n == nil \|\| n != boks\.nonce\) \{ return \}\n\s+switch knap \{/.test(m)); check('5f boksen faar menuens knapper for spoergsmaalet', /menuKnapper: spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)\.knapper/.test(m) && /let mm = spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)/.test(m)); -check('5g placeringen: skaermen med det forreste vindue', /let i = boksSkaerm\(forrestVindue: forrestVindue\(\), mus: NSEvent\.mouseLocation, skaerme: skaerme\.map \{ \$0\.frame \}\)\n\s+let f = skaerme\[i\]\.visibleFrame/.test(m)); +check('5g placeringen: skaermen med det forreste vindue, hjoernet fra boksHjoerne', + /let i = boksSkaerm\(forrestVindue: forrestVindue\(\), mus: NSEvent\.mouseLocation, skaerme: skaerme\.map \{ \$0\.frame \}\)\n\s+let f = skaerme\[i\]\.visibleFrame\n\s+setFrameTopLeftPoint\(boksHjoerne\(synlig: f, bredde: frame\.width\)\)/.test(m)); +check('5j det forreste vindue er det forreste PROGRAMS (forrestVinduesRamme med dets pid)', + /guard let pid = NSWorkspace\.shared\.frontmostApplication\?\.processIdentifier,[\s\S]{0,300}let r = forrestVinduesRamme\(liste, pid: pid\)\n\s+else \{ return nil \}\n\s+return cocoaRamme\(r, hovedHoejde: hovedHoejde\)/.test(m)); check('5h flyttes med: ny skaerm-opsaetning, og naar mennesket skifter skaerm', /didChangeScreenParametersNotification[\s\S]{0,200}boks\.placer\(\)/.test(m) && /else if boks\.skalFlyttes\(\) \{ boks\.placer\(\) \}/.test(m)); -check('5i boksen tager aldrig tastaturet og er ikke med i agenternes skaermbilleder', +check('5i boksen tager aldrig tastaturet og beder om ikke at blive delt (sharingType none - om optagelser respekterer det, er UMAALT)', /override var canBecomeKey: Bool \{ false \}/.test(m) && /sharingType = \.none/.test(m) && /\.nonactivatingPanel/.test(m)); console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index 7364e028..a284e360 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -143,9 +143,10 @@ const kilder = readdirSync(KILDE).filter(f => f.endsWith('.swift')); const src = Object.fromEntries(kilder.map(f => [f, readFileSync(join(KILDE, f), 'utf8')])); const ax = src['Accessibility.swift'], mainSwift = src['main.swift']; check('6a AX.app er opslaget og intet andet', /static func app\(bundleId: String\) -> NSRunningApplication\? \{ appOpslag\(bundleId\)\.app \}/.test(ax)); -check('6a2 opslaget vaelger med Navne.vaelgApp og returnerer netop det valgte', - /Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); -check('6b programmer paa disken: Navne.vaelg og netop det valgte', /guard case \.fundet\(let i\) = Navne\.vaelg\(fund\.map \{ \$0\.deletingPathExtension\(\)\.lastPathComponent \}, hvad\) else \{ return nil \}\n\s+return fund\[i\]/.test(ax)); +check('6a2 opslaget vaelger med Navne.vaelgApp og returnerer netop det valgte - intet foer det (R17, Astra A17)', + /static func appOpslag\(_ hvad: String\) -> \(app: NSRunningApplication\?, tvetydig: Bool\) \{\n\s+let alle = allApps\(\)\n\s+switch Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); +check('6b programmer paa disken: praecist filnavn, ellers Navne.vaelg over HELE listen og netop det valgte (R17, Astra A18)', + /if FileManager\.default\.fileExists\(atPath: k\.path\) \{ return k \}\n\s+\}\n(\s+\/\/[^\n]*\n)*\s+var fund: \[URL\] = \[\]\n\s+for m in mapper \{\n\s+for f in \(try\? FileManager\.default\.contentsOfDirectory\(atPath: m\)\) \?\? \[\] where f\.hasSuffix\("\.app"\) \{\n\s+fund\.append\(URL\(fileURLWithPath: m\)\.appendingPathComponent\(f\)\)\n\s+\}\n\s+\}\n\s+/.test(ax) && /guard case \.fundet\(let i\) = Navne\.vaelg\(fund\.map \{ \$0\.deletingPathExtension\(\)\.lastPathComponent \}, hvad\) else \{ return nil \}\n\s+return fund\[i\]/.test(ax)); check('6c --app oversaettes ét sted, foer alle kommandoer', /^let args = Args\(Navne\.oversaet\(CommandLine\.arguments\) \{ AX\.app\(bundleId: \$0\)\?\.bundleIdentifier \}\)/m.test(mainSwift)); const navneSammenligninger = kilder.flatMap(f => src[f].split('\n').map((l, i) => ({ f, n: i + 1, l }))) .filter(({ f, l }) => f !== 'Navne.swift' && /(localizedName|applicationName)\??\.lowercased\(\)/.test(l)); From 9bd135f660bb746e0607a9a6dd4ad7b9dc6972c8 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 11:28:21 +0200 Subject: [PATCH 108/132] fix(port): R17 (Astra + Opus enige) - leveringen faar portens maal, og boksen viser hvor og hvor laenge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bundet maal: har porten fundet et KOERENDE program, faar alt efter porten (forhaandstjek, genmaaling, levering) det valgte id som `=` (appArg i index.js). findProgram og Navne.oversaet slaar saa kun det praecise id op; er det vaek, svarer hjaelperen app-gone, og intet sker. Tekst, samtykke og log beholder agentens navn. Opstart af et LUKKET program beholder navnet (Opus 3a: et id ville lade Launch Services vaelge enhver kopi). «Er det programmet mennesket bruger?» vurderes over alle processer med id'et (Opus P2: regression fra c3bb330). Programmer uden bundle-id (fx bygget med swiftc) faar «pid:» som id ved indgangen, og alle filtre sammenligner gennem AX.passer - fundet af test/vaelger.mjs, som var roed efter 269f9ca. Boksen: menuens fakta (omfang + «Lands in») altid hele (Opus 4c); knapperne venter 1 s efter et nyt spoergsmaal og er fra mens Touch ID er oppe (4b, 4f); trykket afgoeres af boksHandling (ren funktion, proevet med adfaerd). README/CHANGELOG: hvem, hvad, hvor og hvor laenge; «you see everything a yes covers». Proever: bundet-maal 4/4 gennem den rigtige server; ikon-boks 37; usynlige-navne 82; 40/40 skaermsikre proever groenne med suitens miljoe (CMCP_STATUS_IKON=0). Mutanter Z1-Z16 roede (Z3/Z6/Z16 skaerpet efter de overlevede); 181 ankre. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 214 ++++++++++++++++-- .github/workflows/ci.yml | 4 + CHANGELOG.md | 5 +- README.md | 12 +- .../Sources/cmcp-helper/Accessibility.swift | 13 +- helper/Sources/cmcp-helper/Capture.swift | 8 +- helper/Sources/cmcp-helper/Navne.swift | 20 +- helper/Sources/cmcp-helper/main.swift | 8 +- helper/Sources/cmcp-status/Tekst.swift | 30 ++- helper/Sources/cmcp-status/main.swift | 42 ++-- mcp-server/README.md | 12 +- mcp-server/helper.js | 8 +- mcp-server/index.js | 58 +++-- test/baggrund-stille.mjs | 3 +- test/bundet-maal.mjs | 100 ++++++++ test/ikon-boks.mjs | 79 +++++-- test/ikon-menu.mjs | 2 +- test/run-all.sh | 2 + test/usynlige-navne.mjs | 54 ++++- 19 files changed, 567 insertions(+), 107 deletions(-) create mode 100644 test/bundet-maal.mjs diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 57dc78d6..3e56f2d1 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1568,8 +1568,8 @@ "fil": "mcp-server/helper.js", "par": [ [ - "const hit = findProgram(r.apps || [], want);\n return hit ? { bundleId", - "const hit = (r.apps || []).find(a => [a.bundleId, a.name].some(v => (v || '').toLowerCase() === want.toLowerCase()));\n return hit ? { bundleId" + "const hit = findProgram(r.apps || [], want);\n // R17 (Opus P2)", + "const hit = (r.apps || []).find(a => [a.bundleId, a.name].some(v => (v || '').toLowerCase() === want.toLowerCase()));\n // R17 (Opus P2)" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1580,7 +1580,7 @@ "fil": "helper/Sources/cmcp-helper/main.swift", "par": [ [ - "let args = Args(Navne.oversaet(CommandLine.arguments) { AX.app(bundleId: $0)?.bundleIdentifier })", + "let args = Args(oversatArgv)", "let args = Args(CommandLine.arguments)" ] ], @@ -1712,8 +1712,8 @@ "fil": "helper/Sources/cmcp-helper/main.swift", "par": [ [ - "if let scope = args.str(\"app\"), a.bundleIdentifier != scope { continue }", - "if let scope = args.str(\"app\"), a.bundleIdentifier != scope, a.localizedName?.lowercased() != scope.lowercased() { continue }" + "if let scope = args.str(\"app\"), !AX.passer(a, scope) { continue }", + "if let scope = args.str(\"app\"), !AX.passer(a, scope), a.localizedName?.lowercased() != scope.lowercased() { continue }" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1748,8 +1748,8 @@ "fil": "helper/Sources/cmcp-status/main.swift", "par": [ [ - "case \"Allow (Touch ID)\": tilladNonce(n, kilde: \"allow-box\")", - "case \"Allow (Touch ID)\": aaben(n)?.svar(ok: true)" + "case .tillad(let n): tilladNonce(n, kilde: \"allow-box\")", + "case .tillad(let n): aaben(n)?.svar(ok: true)" ] ], "proeve": "test/ikon-boks.mjs", @@ -1904,8 +1904,8 @@ "fil": "helper/Sources/cmcp-helper/Accessibility.swift", "par": [ [ - " let alle = allApps()\n switch Navne.vaelgApp(", - " let alle = allApps()\n if let a = alle.first(where: { Navne.noegle($0.localizedName ?? \"\") == Navne.noegle(hvad) }) { return (a, false) }\n switch Navne.vaelgApp(" + "false) }\n switch Navne.vaelgApp(", + "false) }\n if let a = alle.first(where: { Navne.noegle($0.localizedName ?? \"\") == Navne.noegle(hvad) }) { return (a, false) }\n switch Navne.vaelgApp(" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1984,27 +1984,207 @@ "forventet": "3e" }, { - "navn": "Y8-klik-fra-aeldre-visning", + "navn": "Y9-placering-uden-hjoernet", "fil": "helper/Sources/cmcp-status/main.swift", "par": [ [ - "if knap != \"Follow\" && (n == nil || n != boks.nonce) { return }", - "_ = n" + "setFrameTopLeftPoint(boksHjoerne(synlig: f, bredde: frame.width))", + "setFrameTopLeftPoint(NSPoint(x: f.minX - 500, y: f.maxY))" ] ], "proeve": "test/ikon-boks.mjs", - "forventet": "5e" + "forventet": "5g" }, { - "navn": "Y9-placering-uden-hjoernet", + "navn": "Z1-maalet-bindes-ikke", + "fil": "mcp-server/index.js", + "par": [ + [ + " if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal;\n", + "" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "1a" + }, + { + "navn": "Z2-hjaelperkald-uden-binding", + "fil": "mcp-server/index.js", + "par": [ + [ + "const appArg = (args) => (args[BUNDET] ? `=${args[BUNDET]}` : String(args.app));", + "const appArg = (args) => String(args.app);" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "1a" + }, + { + "navn": "Z3-lukket-program-bindes", + "fil": "mcp-server/index.js", + "par": [ + [ + " if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal;", + " if (args.app && targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = targetBundleId;" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "2" + }, + { + "navn": "Z4-serveren-bundet-falder-til-navne", + "fil": "mcp-server/helper.js", + "par": [ + [ + " if (w.startsWith('=')) return (w.length > 1 && apps.find(a => (a.bundleId || '') === w.slice(1))) || null;\n", + "" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1b.1" + }, + { + "navn": "Z5-hjaelperen-bundet-uden-tjek", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "guard !id.isEmpty, findesPraecist(id) else { return nil }", + "guard !id.isEmpty else { return nil }" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2c.6" + }, + { + "navn": "Z6-aktiv-kun-for-den-ene-proces", + "fil": "mcp-server/helper.js", + "par": [ + [ + "const aktiv = !!hit?.active || (!!hit?.bundleId && (r.apps || []).some(a => a.bundleId === hit.bundleId && a.active));", + "const aktiv = !!hit?.active;" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "3" + }, + { + "navn": "Z7-boksen-uden-hvor-og-hvor-laenge", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " for f in v.fakta { linjer += ombryd(f, bredde: BOKS_BREDDE_TEGN) }\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "2h" + }, + { + "navn": "Z8-ingen-pause-efter-nyt-spoergsmaal", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "sidenNytSpoergsmaal >= BOKS_PAUSE && !touchIdIGang", + "!touchIdIGang" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6c" + }, + { + "navn": "Z9-knapper-aktive-under-touch-id", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " sidenNytSpoergsmaal >= BOKS_PAUSE && !touchIdIGang\n", + " sidenNytSpoergsmaal >= BOKS_PAUSE\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6c" + }, + { + "navn": "Z10-deny-bliver-done", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "case \"Deny\", \"I won't do this\": return .afvis(n)", + "case \"Deny\", \"I won't do this\": return .gjort(n)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6a" + }, + { + "navn": "Z11-klik-fra-aeldre-visning", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "guard aktive, let n = knapNonce, n == visteNonce else { return .intet }", + "guard let n = knapNonce else { return .intet }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6a" + }, + { + "navn": "Z12-boksen-svarer-paa-sidste-spoergsmaal", "fil": "helper/Sources/cmcp-status/main.swift", "par": [ [ - "setFrameTopLeftPoint(boksHjoerne(synlig: f, bredde: frame.width))", - "setFrameTopLeftPoint(NSPoint(x: f.minX - 500, y: f.maxY))" + "let foerste = aabne.first", + "let foerste = aabne.last" ] ], "proeve": "test/ikon-boks.mjs", - "forventet": "5g" + "forventet": "5m" + }, + { + "navn": "Z13-touch-id-slipper-aldrig-knapperne", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " self?.boks.touchIdIGang = false\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5k" + }, + { + "navn": "Z14-take-me-there-forkert", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "case \"Take me there\": return .hentFrem(n)", + "case \"Take me there\": return .afvis(n)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6a" + }, + { + "navn": "Z15-program-uden-id-kan-ikke-naas", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + " if let b = bundleId, !b.isEmpty { return b }\n return \"pid:\\(pid)\"", + " return bundleId ?? \"\"" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2d" + }, + { + "navn": "Z16-filter-uden-pid", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + " Navne.id(bundleId: a.bundleIdentifier, pid: a.processIdentifier) == scope\n", + " a.bundleIdentifier == scope\n" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6g" } ] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f618d67c..467a5de7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,10 @@ jobs: - name: Boksen i hjoernet run: node test/ikon-boks.mjs + # R17 (9/10): det program porten vurderede, er det handlingen rammer (attrap-hjaelper). + - name: Bundet maal + run: node test/bundet-maal.mjs + # 7/10 (panel R12, Opus): pluginnet skal pege paa PUBLICERET - den version npm # serverer. Flettes en gren uden at sync-tal.py har koert efter en udgivelse, # bliver main roed her, og release.sh nægter at udgive. diff --git a/CHANGELOG.md b/CHANGELOG.md index ca0309c3..96a9b83a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,8 +27,9 @@ off in the icon's menu. (`test/ikon-lyd.mjs`) a box in the top-right corner shows which agents are working, in which app and what they are doing - on the screen with the window you are using, not the one the pointer is on, and it follows you between screens. When a question waits, it -turns orange and shows the whole question with the menu's own buttons: -`Allow (Touch ID)` and `Deny`. Allowing still asks for Touch ID every time; for a +turns orange and shows the whole question - who, what, where it lands and how +long a yes counts - with the menu's own buttons: `Allow (Touch ID)` and `Deny`; +the buttons wait a second after a new question appears. Allowing still asks for Touch ID every time; for a question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) **WhatsApp by its name.** WhatsApp's name starts with an invisible character (U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: diff --git a/README.md b/README.md index cc7c1e5b..281dd271 100644 --- a/README.md +++ b/README.md @@ -361,11 +361,13 @@ all this product puts on your screen, and neither ever takes focus. server used to refuse anything that needed a human, because a dialog takes the screen. Now it waits for you instead: the question sits in the icon until you answer it, and the agent is told nothing happened until you do. -- **The box turns orange too, with the whole question.** It shows who is asking - and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` - for something you do yourself). For a question longer than 280 characters, - `Allow` is only in the menu, where all of it is shown: a yes has to cover - everything you saw. +- **The box turns orange too, with the whole question.** It shows who is asking, + what, where it lands and how long a yes counts - the same lines the server + writes into the menu - with the menu's own buttons: `Allow (Touch ID)` and + `Deny` (or `Done` for something you do yourself). The buttons wait a second + after a new question appears, so a click meant for the last one cannot land on + it. For a question longer than 280 characters, `Allow` is only in the menu, + where all of it is shown: you see everything a yes covers before you give it. - **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one click in the main menu; in the box it is a button. Both ask for Touch ID (or your Mac's password) every time. The diff --git a/helper/Sources/cmcp-helper/Accessibility.swift b/helper/Sources/cmcp-helper/Accessibility.swift index 59ee6142..636629a8 100644 --- a/helper/Sources/cmcp-helper/Accessibility.swift +++ b/helper/Sources/cmcp-helper/Accessibility.swift @@ -164,11 +164,18 @@ enum AX { /// navngive et menulinje-program. Det var kun DE SEKS veje der ikke kunne. static func app(bundleId: String) -> NSRunningApplication? { appOpslag(bundleId).app } + /// Passer et program til et --app der allerede er oversat ved indgangen (id eller «pid:»)? + static func passer(_ a: NSRunningApplication, _ scope: String) -> Bool { + Navne.id(bundleId: a.bundleIdentifier, pid: a.processIdentifier) == scope + } + /// Id'et eller navnet slaaet op efter Navne-reglen - samme regel som serverens port. /// `tvetydig`: flere passer kun uden usynlige tegn; saa vaelges intet, og opstarten /// falder heller ikke tilbage paa disken (R16, Astra). static func appOpslag(_ hvad: String) -> (app: NSRunningApplication?, tvetydig: Bool) { let alle = allApps() + // Et program uden id, allerede oversat til sin proces: kun den proces. + if hvad.hasPrefix("pid:") { return (alle.first { Navne.id(bundleId: $0.bundleIdentifier, pid: $0.processIdentifier) == hvad }, false) } switch Navne.vaelgApp(ids: alle.map { $0.bundleIdentifier }, navne: alle.map { $0.localizedName }, want: hvad) { case .fundet(let i): return (alle[i], false) case .tvetydig: return (nil, true) @@ -492,7 +499,7 @@ enum AX { // Tom maengde = vi kunne ikke spoerge vinduesserveren; saa tager vi alle. if !visible.isEmpty && !visible.contains(a.processIdentifier) { return false } guard let scope = scopeBundleId else { return true } - return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) + return AX.passer(a, scope) // navnet er oversat til id ved indgangen (Navne.oversaet) } // ⛔ MAALT 24/9: BUDGETTET BANDT IKKE DET DET HED EFTER. @@ -686,7 +693,7 @@ enum AX { var nodes: [[String: Any]] = [] let apps = allApps().filter { a in guard let scope = bundleId else { return true } - return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) + return AX.passer(a, scope) // navnet er oversat til id ved indgangen (Navne.oversaet) } outer: for app in apps { // Et spaerret program afleverer KUN at det findes - aldrig indhold. @@ -803,7 +810,7 @@ extension AX { let apps = allApps().filter { a in guard let scope = bundleId else { return true } - return a.bundleIdentifier == scope // navnet er oversat til id ved indgangen (Navne.oversaet) + return AX.passer(a, scope) // navnet er oversat til id ved indgangen (Navne.oversaet) } outer: for app in apps { diff --git a/helper/Sources/cmcp-helper/Capture.swift b/helper/Sources/cmcp-helper/Capture.swift index 356a35dd..1195a5bd 100644 --- a/helper/Sources/cmcp-helper/Capture.swift +++ b/helper/Sources/cmcp-helper/Capture.swift @@ -114,7 +114,7 @@ enum Capture { // skaerm programmets foerste vindue faktisk staar paa. if displayId == nil && displayIndex == nil, let bid = bundleId, let app = AX.allApps().first(where: { - $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) + AX.passer($0, bid) // navnet er oversat til id ved indgangen (Navne.oversaet) }), let w = AX.windows(of: app).first, let r = AX.frame(w) { @@ -169,7 +169,7 @@ enum Capture { $0.bundleIdentifier == bid || $0.applicationName.lowercased() == bid.lowercased() } let axNavngivet = AX.allApps().filter { - $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) + AX.passer($0, bid) // navnet er oversat til id ved indgangen (Navne.oversaet) } if erSpaerretId(bid) || navngivet.contains(where: { erSpaerretId($0.bundleIdentifier) }) || axNavngivet.contains(where: { erSpaerretId($0.bundleIdentifier) }) { @@ -187,7 +187,7 @@ enum Capture { let filter: SCContentFilter if let bid = bundleId { let apps = content.applications.filter { - $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) + Navne.id(bundleId: $0.bundleIdentifier, pid: $0.processID) == bid // navnet er oversat ved indgangen (Navne.oversaet) } guard !apps.isEmpty else { // MAALT 18/9: her stod "the app is not running", og det var @@ -200,7 +200,7 @@ enum Capture { // program der staar lige for naesen af dem. Vi spoerger // arbejdsbordet i stedet og siger hvad der faktisk er galt. let running = AX.allApps().contains { - $0.bundleIdentifier == bid // navnet er oversat til id ved indgangen (Navne.oversaet) + AX.passer($0, bid) // navnet er oversat til id ved indgangen (Navne.oversaet) } box.set(failure: running ? "'\(bid)' is running, but has no windows on the desktop that is showing. A full-screen app gives itself its own desktop, and everything else sits on another. Switch to it with computer_activate or computer_space, or leave full screen." diff --git a/helper/Sources/cmcp-helper/Navne.swift b/helper/Sources/cmcp-helper/Navne.swift index fa185232..db7137b1 100644 --- a/helper/Sources/cmcp-helper/Navne.swift +++ b/helper/Sources/cmcp-helper/Navne.swift @@ -68,12 +68,28 @@ enum Navne { return vaelg(navne.map { $0 ?? "" }, want) } + /// Programmets id efter oversaettelsen. Et program uden bundle-id (fx et program + /// bygget med swiftc) faar sin proces som id: «pid:» - ellers kunne det slet ikke + /// naas, naar filtrene kun sammenligner id (R17-koersel 9/10: test/vaelger.mjs). + static func id(bundleId: String?, pid: Int32) -> String { + if let b = bundleId, !b.isEmpty { return b } + return "pid:\(pid)" + } + /// `--app ` oversat ÉN gang, foer nogen kommando ser det. `slaaOp` er /// opslaget blandt de koerende programmer; giver det intet, staar argumentet uroert. - static func oversaet(_ argv: [String], slaaOp: (String) -> String?) -> [String] { + /// R17: `--app =` er et maal serverens port har bundet - kun det praecise id, og + /// koerer det ikke (`findesPraecist`), er svaret nil: intet maa ske. + static func oversaet(_ argv: [String], slaaOp: (String) -> String?, + findesPraecist: (String) -> Bool) -> [String]? { var a = argv for i in a.indices.dropLast() where a[i] == "--app" && !a[i + 1].hasPrefix("--") { - if let bid = slaaOp(a[i + 1]) { a[i + 1] = bid } + let v = a[i + 1] + if v.hasPrefix("=") { + let id = String(v.dropFirst()) + guard !id.isEmpty, findesPraecist(id) else { return nil } + a[i + 1] = id + } else if let bid = slaaOp(v) { a[i + 1] = bid } } return a } diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 295369ea..e2270485 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -30,7 +30,11 @@ let HELPER_VERSION = "0.2.2" /// Nu oversaettes et navn ÉN gang, her, til det bundle-id Navne-reglen vaelger /// blandt de koerende programmer - samme program som serverens port vurderede. /// Koerer programmet ikke, eller passer flere, staar argumentet uroert. -let args = Args(Navne.oversaet(CommandLine.arguments) { AX.app(bundleId: $0)?.bundleIdentifier }) +guard let oversatArgv = Navne.oversaet(CommandLine.arguments, slaaOp: { AX.app(bundleId: $0).map { Navne.id(bundleId: $0.bundleIdentifier, pid: $0.processIdentifier) } }, + findesPraecist: { id in AX.allApps().contains { $0.bundleIdentifier == id } }) else { + Out.fail("the app the gate judged is no longer running - nothing was done", code: "app-gone") +} +let args = Args(oversatArgv) // ⛔ FUNDET AF SIKKERHEDSREVIEWET 20/9. `contains` og `title` gik som // ARGUMENTER, og `ps` viser hele kommandolinjen for enhver proces med samme @@ -140,7 +144,7 @@ case "windows": let kilde = args.str("app") != nil ? AX.allApps() : AX.runningApps() var ulaeselige: [String] = [] for a in kilde { - if let scope = args.str("app"), a.bundleIdentifier != scope { continue } // navnet er oversat ved indgangen + if let scope = args.str("app"), !AX.passer(a, scope) { continue } // navnet er oversat ved indgangen let svar = AX.windowsMed(of: a) // ⛔ 24/9: et program der ikke svarede, maa ikke se ud som et program // uden vinduer. Se `windowsMed` for hvordan de to blev blandet. diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index 3edafabe..61c62afd 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -38,6 +38,9 @@ func kort(_ s: String, _ n: Int) -> String { /// Saa mange tegn kan boksen vise HELT, ombrudt. let BOKS_MAX_TEGN = 280 let BOKS_BREDDE_TEGN = 48 +/// Knapperne goer intet saa laenge efter et NYT spoergsmaal (R17, Opus 4b): et klik +/// paa vej mod det gamle maa ikke ramme det nye, der gled ind under markoeren. +let BOKS_PAUSE: TimeInterval = 1.0 struct BoksIndhold: Equatable { let titel: String @@ -54,13 +57,16 @@ func boksKnap(_ menuKnap: String) -> String { /// `arbejder`: dem der arbejder nu (navn, hvilket program, hvad de goer). /// `venter`: det foerste aabne spoergsmaal og menuens knapper for det. func boksIndhold(arbejder: [(navn: String, maal: String?, nu: String)], tilsluttede: Int, - venter: (antal: Int, klient: String?, tekst: String, menuKnapper: [String])?) -> BoksIndhold { + venter: (antal: Int, klient: String?, tekst: String, fakta: [String], menuKnapper: [String])?) -> BoksIndhold { if let v = venter { let hel = renTekst(v.tekst) let helVist = hel.count <= BOKS_MAX_TEGN var linjer = helVist ? ombryd(hel, bredde: BOKS_BREDDE_TEGN) : ombryd(String(hel.prefix(120)) + "…", bredde: BOKS_BREDDE_TEGN) + ["(\(hel.count) characters - the whole text is in the menu bar icon)"] + // ⛔ R17 (Opus 4c): HVOR det lander og HVOR LAENGE et ja gaelder - menuens fakta, + // skrevet af serveren. Altid hele, saa Allow aldrig staar uden dem. + for f in v.fakta { linjer += ombryd(f, bredde: BOKS_BREDDE_TEGN) } if v.antal > 1 { linjer.append("+\(v.antal - 1) more in the menu bar icon") } let knapper = v.menuKnapper .filter { helVist || $0 != "Allow… (confirm with Touch ID)" } @@ -78,6 +84,28 @@ func boksIndhold(arbejder: [(navn: String, maal: String?, nu: String)], tilslutt return BoksIndhold(titel: titel, orange: false, linjer: linjer, knapper: arbejder.isEmpty ? [] : ["Follow"]) } +/// Maa boksens knapper goere noget nu? Ikke foer BOKS_PAUSE efter et nyt spoergsmaal, +/// og ikke mens Touch ID-arket er oppe (et andet tryk ville starte endnu et, R17 Opus 4f). +func boksKnapperAktive(sidenNytSpoergsmaal: TimeInterval, touchIdIGang: Bool) -> Bool { + sidenNytSpoergsmaal >= BOKS_PAUSE && !touchIdIGang +} + +enum BoksHandling: Equatable { case foelg, tillad(String), afvis(String), gjort(String), hentFrem(String), intet } + +/// Hvad et tryk paa en boksknap betyder. Knappen baerer sit eget spoergsmaal (`knapNonce`); +/// er det ikke det boksen viser nu, eller er knapperne ikke aktive, sker intet. +func boksHandling(knap: String, knapNonce: String?, visteNonce: String?, aktive: Bool) -> BoksHandling { + if knap == "Follow" { return .foelg } + guard aktive, let n = knapNonce, n == visteNonce else { return .intet } + switch knap { + case "Allow (Touch ID)": return .tillad(n) + case "Done — I did it": return .gjort(n) + case "Take me there": return .hentFrem(n) + case "Deny", "I won't do this": return .afvis(n) + default: return .intet + } +} + /// Hvilken skaerm arbejder mennesket paa? Den med det forreste vindue; ellers den /// musen er paa; ellers den foerste. Rammerne er i Cocoa-koordinater. func boksSkaerm(forrestVindue: CGRect?, mus: CGPoint, skaerme: [CGRect]) -> Int { diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index f92f8d0e..c8cdd2a1 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -332,6 +332,16 @@ final class Boks: NSPanel { /// saa et klik altid gaelder det mennesket saa. private(set) var nonce: String? = nil private var vist: BoksIndhold? = nil + /// Hvornaar det viste spoergsmaal kom, og om Touch ID-arket er oppe (R17, Opus). + private var nytSpoergsmaal = Date.distantPast + var touchIdIGang = false { didSet { opdaterKnapper() } } + func knapperAktive() -> Bool { + boksKnapperAktive(sidenNytSpoergsmaal: Date().timeIntervalSince(nytSpoergsmaal), touchIdIGang: touchIdIGang) + } + func opdaterKnapper() { + let aktiv = nonce == nil || knapperAktive() + for case let b as NSButton in knapper.arrangedSubviews { b.isEnabled = aktiv } + } /// Den skaerm boksen sidst blev sat paa. private(set) var placeretPaa: CGRect? = nil /// (knappens titel, det spoergsmaal KNAPPEN blev lavet til) - R17 (Astra). @@ -409,6 +419,10 @@ final class Boks: NSPanel { func vis(_ ind: BoksIndhold, nonce ny: String?, sessioner: [Session]) { if ind == vist && ny == nonce { return } + if ny != nonce && ny != nil { + nytSpoergsmaal = Date() + DispatchQueue.main.asyncAfter(deadline: .now() + BOKS_PAUSE + 0.05) { [weak self] in self?.opdaterKnapper() } + } vist = ind; nonce = ny titel.stringValue = ind.titel titel.textColor = ind.orange ? .systemOrange : .labelColor @@ -435,6 +449,7 @@ final class Boks: NSPanel { knapper.addArrangedSubview(b) } knapper.isHidden = knapper.arrangedSubviews.isEmpty + opdaterKnapper() stak.layoutSubtreeIfNeeded() let hoejde = ceil(stak.fittingSize.height) let top = frame.maxY @@ -527,7 +542,7 @@ if CommandLine.arguments.contains("--dump-question") { "box": { () -> [String: Any] in // Boksen i hjoernet for samme spoergsmaal - samme funktion som den rigtige boks. let b = boksIndhold(arbejder: [], tilsluttede: 0, - venter: (antal: 1, klient: s.client, tekst: s.text, menuKnapper: m.knapper)) + venter: (antal: 1, klient: s.client, tekst: s.text, fakta: m.fakta, menuKnapper: m.knapper)) return ["title": b.titel, "orange": b.orange, "lines": b.linjer, "buttons": b.knapper] }()] if let v = m.ventetekst { ud["waitingForLoan"] = v } @@ -722,8 +737,8 @@ final class Ikon: NSObject, NSMenuDelegate { let aktive = s.filter { $0.now != nil || (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 } let foerste = aabne.first let venter = foerste.map { a in - (antal: aabne.count, klient: a.s.client, tekst: a.s.text, - menuKnapper: spoergsmaalMenu(a.s, aktivtAndetLaan: andetLaan(a)).knapper) + let mm = spoergsmaalMenu(a.s, aktivtAndetLaan: andetLaan(a)) + return (antal: aabne.count, klient: a.s.client, tekst: a.s.text, fakta: mm.fakta, menuKnapper: mm.knapper) } let arbejdende = aktive.map { sess in (navn: navn(sess), maal: senesteMaal(sess), @@ -909,16 +924,15 @@ final class Ikon: NSObject, NSMenuDelegate { /// Boksens knapper (9/10): samme handlinger som menuens - Allow gaar gennem /// tilladNonce og dermed Touch ID. Knappen svarer paa det spoergsmaal boksen viste. func boksKnapTrykket(_ knap: String, nonce n: String?) { - // Et klik fra en visning der er skiftet siden, goer intet (R17, Astra): knappens - // eget spoergsmaal skal vaere det boksen viser NU. - if knap != "Follow" && (n == nil || n != boks.nonce) { return } - switch knap { - case "Follow": foelgFraBoks() - case "Allow (Touch ID)": tilladNonce(n, kilde: "allow-box") - case "Done — I did it": gjortNonce(n, kilde: "done-box") - case "Take me there": hentFremNonce(n) - case "Deny", "I won't do this": afvisNonce(n, kilde: "deny-box") - default: break + // Knappens eget spoergsmaal skal vaere det boksen viser NU, og knapperne skal vaere + // aktive (R17: Astra + Opus) - ellers sker intet. Afgoeres i boksHandling (Tekst.swift). + switch boksHandling(knap: knap, knapNonce: n, visteNonce: boks.nonce, aktive: boks.knapperAktive()) { + case .foelg: foelgFraBoks() + case .tillad(let n): tilladNonce(n, kilde: "allow-box") + case .gjort(let n): gjortNonce(n, kilde: "done-box") + case .hentFrem(let n): hentFremNonce(n) + case .afvis(let n): afvisNonce(n, kilde: "deny-box") + case .intet: break } } @@ -929,7 +943,9 @@ final class Ikon: NSObject, NSMenuDelegate { guard let a = aaben(nonce) else { return } // Et ja i boksen kraever, at boksen viste HELE teksten (som menuen goer). if kilde == "allow-box" && renTekst(a.s.text).count > BOKS_MAX_TEGN { return } + boks.touchIdIGang = true bekraeftMenneske(a) { [weak self] ok in + self?.boks.touchIdIGang = false // Et mislykket Touch ID er et nej, ikke et «proev igen» agenten kan vente paa. if ok && a.s.kind == "screen" { if let l = aktivtLaan, !l.lukket, l !== a { diff --git a/mcp-server/README.md b/mcp-server/README.md index c4ea39b4..37df29fc 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -359,11 +359,13 @@ all this product puts on your screen, and neither ever takes focus. server used to refuse anything that needed a human, because a dialog takes the screen. Now it waits for you instead: the question sits in the icon until you answer it, and the agent is told nothing happened until you do. -- **The box turns orange too, with the whole question.** It shows who is asking - and what, with the menu's own buttons: `Allow (Touch ID)` and `Deny` (or `Done` - for something you do yourself). For a question longer than 280 characters, - `Allow` is only in the menu, where all of it is shown: a yes has to cover - everything you saw. +- **The box turns orange too, with the whole question.** It shows who is asking, + what, where it lands and how long a yes counts - the same lines the server + writes into the menu - with the menu's own buttons: `Allow (Touch ID)` and + `Deny` (or `Done` for something you do yourself). The buttons wait a second + after a new question appears, so a click meant for the last one cannot land on + it. For a question longer than 280 characters, `Allow` is only in the menu, + where all of it is shown: you see everything a yes covers before you give it. - **Allowing is deliberate.** In the menu, `Allow…` lives in a submenu, never one click in the main menu; in the box it is a button. Both ask for Touch ID (or your Mac's password) every time. The diff --git a/mcp-server/helper.js b/mcp-server/helper.js index b8d63dd2..f8051f41 100644 --- a/mcp-server/helper.js +++ b/mcp-server/helper.js @@ -155,6 +155,9 @@ export const navneNoegle = (s) => smaa(String(s ?? '').replace(USYNLIGE, '').tri export function findProgram(apps, want) { const w = String(want ?? '').trim(); if (!w) return null; + // R17: et maal porten har bundet (`=`, se appArg i index.js) er PRAECIS det id - + // ingen store/smaa, ingen navne. Er det vaek, er svaret intet. + if (w.startsWith('=')) return (w.length > 1 && apps.find(a => (a.bundleId || '') === w.slice(1))) || null; const lw = smaa(w); const hit = apps.find(a => (a.bundleId || '') === w) || apps.find(a => a.bundleId && smaa(a.bundleId) === lw) @@ -231,7 +234,10 @@ export async function resolveApp(appArg) { try { const r = await callHelper(['apps', '--all'], { timeout: 15000 }); // samme maengde som leveringen const hit = findProgram(r.apps || [], want); - return hit ? { bundleId: hit.bundleId || null, active: !!hit.active, name: hit.name } : null; + // R17 (Opus P2): «er det programmet mennesket bruger lige nu?» gaelder ALLE processer + // med det valgte id - hjaelperen leverer til id'et, ikke til den ene proces. + const aktiv = !!hit?.active || (!!hit?.bundleId && (r.apps || []).some(a => a.bundleId === hit.bundleId && a.active)); + return hit ? { bundleId: hit.bundleId || null, active: aktiv, name: hit.name } : null; } catch { return null; } diff --git a/mcp-server/index.js b/mcp-server/index.js index 7423a043..00bd30ab 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -440,7 +440,7 @@ function medInput(r, res) { /// Samme soegning for trykket og for sende-portens --dry: ellers kunne porten /// doemme ét element og trykket ramme et andet. function trykArgv(args) { - const a = ['press', '--match-stdin', '--app', String(args.app)]; + const a = ['press', '--match-stdin', '--app', appArg(args)]; if (args.role) a.push('--role', String(args.role)); if (args.subrole) a.push('--subrole', String(args.subrole)); if (Number.isInteger(args.index)) a.push('--index', String(args.index)); @@ -795,6 +795,16 @@ async function optag(args) { note: 'Recording. Call computer_record with action "stop" to finish the file.' }); } +/// ⛔ R17 (Astra + Opus, enige 9/10): navnet fortolkes ÉN gang - af porten. Har porten +/// fundet et KOERENDE program, faar alt efter porten (forhaandstjek, genmaaling og +/// levering) det valgte id som `=`: hjaelperen og findProgram slaar saa KUN det +/// praecise id op og afviser, hvis programmet er vaek - ingen navne, ingen store/smaa. +/// Tekst, samtykke og log beholder agentens navn (args.app er uroert). +/// Opstart af et lukket program beholder navnet: et id ville lade Launch Services +/// vaelge enhver kopi der paastaar id'et (programURL, 24/9). +const BUNDET = Symbol('bundet maal'); +const appArg = (args) => (args[BUNDET] ? `=${args[BUNDET]}` : String(args.app)); + async function runTool(name, args) { switch (name) { case 'computer_permissions': { @@ -815,7 +825,7 @@ async function runTool(name, args) { } case 'computer_apps': return textResult(await callHelper(['apps'])); case 'computer_windows': { - const a = ['windows']; if (args.app) a.push('--app', String(args.app)); + const a = ['windows']; if (args.app) a.push('--app', appArg(args)); return textResult(await callHelper(a)); } case 'computer_inspect': { @@ -832,7 +842,7 @@ async function runTool(name, args) { // // `format: 'json'` findes stadig for den der vil have rammer og dybde. const a = ['inspect']; - if (args.app) a.push('--app', String(args.app)); + if (args.app) a.push('--app', appArg(args)); a.push('--depth', String(args.depth ?? 40), '--limit', String(args.limit ?? 1500)); const r = await callHelper(a); const noder = r?.nodes || []; @@ -908,7 +918,7 @@ async function runTool(name, args) { }); } case 'computer_launch': { - const r = await callHelper(['launch', '--app', String(args.app), + const r = await callHelper(['launch', '--app', appArg(args), ...(args.background ? ['--background'] : [])]); return medSkaerm(textResult(r), r); } @@ -943,7 +953,7 @@ async function runTool(name, args) { // det op for den her vej. Et program der rejser et «vil du gemme?»-ark // kan hive sig selv frem - og det skal staa der, ogsaa naar det ikke // var os der gjorde det. - const r = await callHelper(['quit', '--app', String(args.app)]); + const r = await callHelper(['quit', '--app', appArg(args)]); return medSkaerm(textResult(r), r); } case 'computer_drag': @@ -964,7 +974,7 @@ async function runTool(name, args) { return textResult(await callHelper(a, { stdin: String(args.text) })); } case 'computer_window': { - const base = ['--app', String(args.app)]; + const base = ['--app', appArg(args)]; if (args.title) base.push('--title', String(args.title)); if (Number.isInteger(args.index)) base.push('--index', String(args.index)); if (args.button) { @@ -994,13 +1004,13 @@ async function runTool(name, args) { return medSkaerm(textResult(rw), rw); } case 'computer_menus': { - const a = ['menus', '--app', String(args.app)]; + const a = ['menus', '--app', appArg(args)]; if (Number.isInteger(args.depth)) a.push('--depth', String(args.depth)); return textResult(await callHelper(a)); } case 'computer_menu': { // took_screen: et menupunkt kan faa programmet til at hente sig selv frem (27/9). - const r = await callHelper(['menu-click', '--app', String(args.app), '--path', String(args.path)]); + const r = await callHelper(['menu-click', '--app', appArg(args), '--path', String(args.path)]); return medSkaerm(textResult(r), r); } case 'computer_displays': @@ -1009,7 +1019,7 @@ async function runTool(name, args) { case 'computer_screenshot': { const out = join(tmpdir(), `cmcp-${randomUUID()}.png`); const a = ['screenshot', '--out', out, '--max-width', String(args.maxWidth ?? 1400)]; - if (args.app) a.push('--app', String(args.app)); + if (args.app) a.push('--app', appArg(args)); if (args.redact === false) a.push('--no-redact'); if (Number.isInteger(args.displayId)) a.push('--display-id', String(args.displayId)); else if (Number.isInteger(args.display)) a.push('--display', String(args.display)); @@ -1055,7 +1065,7 @@ async function runTool(name, args) { // hemmelige, kaldet gjorde ikke. De gaar nu paa stdin, som den skrevne // tekst har gjort siden 18/9. const a = ['find', '--match-stdin']; - if (args.app) a.push('--app', String(args.app)); + if (args.app) a.push('--app', appArg(args)); if (args.role) a.push('--role', String(args.role)); if (args.subrole) a.push('--subrole', String(args.subrole)); a.push('--depth', String(args.depth ?? 24), '--limit', String(args.limit ?? 25)); @@ -1075,7 +1085,7 @@ async function runTool(name, args) { // hemmelige, kaldet gjorde ikke. De gaar nu paa stdin, som den skrevne // tekst har gjort siden 18/9. const a = ['set-value', '--match-stdin']; - if (args.app) a.push('--app', String(args.app)); + if (args.app) a.push('--app', appArg(args)); if (args.role) a.push('--role', String(args.role)); if (args.subrole) a.push('--subrole', String(args.subrole)); if (Number.isInteger(args.index)) a.push('--index', String(args.index)); @@ -1099,7 +1109,7 @@ async function runTool(name, args) { // hemmelige, kaldet gjorde ikke. De gaar nu paa stdin, som den skrevne // tekst har gjort siden 18/9. const a = ['wait-for', '--match-stdin']; - if (args.app) a.push('--app', String(args.app)); + if (args.app) a.push('--app', appArg(args)); if (args.role) a.push('--role', String(args.role)); if (args.subrole) a.push('--subrole', String(args.subrole)); const soeg = {}; @@ -1134,7 +1144,7 @@ async function runTool(name, args) { return errorResult('Refused: in background mode, name the `app` whose field the person should use - the field you put the cursor in with computer_press. ' + 'The question then waits in the menu bar icon, and nothing is brought to the front.'); } - const bid = await resolveBundleId(String(args.app)); + const bid = await resolveBundleId(appArg(args)); if (!bid) return errorResult(`Refused: '${args.app}' is not running, so there is no field to type in. Use computer_apps for the exact name.`); let titel = null; try { @@ -1182,7 +1192,7 @@ async function runTool(name, args) { case 'computer_click': { const r = await callHelper(['click', '--x', String(args.x), '--y', String(args.y), '--button', String(args.button || 'left'), '--count', String(args.count || 1), - ...(args.app ? ['--app', String(args.app)] : [])]); + ...(args.app ? ['--app', appArg(args)] : [])]); // ⛔ MAALT 22/9 i e2e-forloebet: et klik leveret til en proces-koe // LANDEDE IKKE - knappen skiftede ikke titel. Og svaret sagde // «Clicked at 395, 245. The pointer stayed where the person left it», @@ -1207,7 +1217,7 @@ async function runTool(name, args) { return textResult('The pointer moved.'); case 'computer_scroll': { const r = await callHelper(['scroll', '--dx', String(args.dx || 0), '--dy', String(args.dy || 0), - ...(args.app ? ['--app', String(args.app)] : [])]); + ...(args.app ? ['--app', appArg(args)] : [])]); return medSkaerm(textResult('Scrolled.' + stilleNote(args.app, r)), r); } case 'computer_type': @@ -1217,7 +1227,7 @@ async function runTool(name, args) { // Hjaelperen har haft --stdin siden 18/9; JS-siden brugte den aldrig. // Det var altsaa et udgivet loefte der var usandt i den udgivne kode. const r = await callHelper(['type', '--stdin', '--cps', String(args.cps || 240), - ...(args.app ? ['--app', String(args.app)] : [])], + ...(args.app ? ['--app', appArg(args)] : [])], { timeout: Math.max(30000, String(args.text).length * 60), stdin: String(args.text) }); // Med et navngivet program skriver hjaelperen i programmets fokuserede felt og // laeser det tilbage (27/9). Kun det kan kaldes «verified»; tastetryk kvitteres ikke. @@ -1227,11 +1237,11 @@ async function runTool(name, args) { return medInput(r, medEffekt(medSkaerm(textResult(`Typed ${String(args.text).length} characters.` + (args.app ? ' Sent as keystrokes to the app\'s own queue; the app does not confirm them, so read the field back if it matters.' : '') + stilleNote(args.app, r)), r), 'sent')); case 'computer_key': { const r = await callHelper(['key', '--combo', String(args.combo), - ...(args.app ? ['--app', String(args.app)] : [])]); + ...(args.app ? ['--app', appArg(args)] : [])]); return medEffekt(medSkaerm(textResult(`Pressed ${args.combo}.` + stilleNote(args.app, r)), r), 'sent'); } case 'computer_activate': - await callHelper(['activate', '--app', String(args.app)]); + await callHelper(['activate', '--app', appArg(args)]); return textResult(`Switched to ${args.app}.`); default: throw new HelperError(`unknown tool: ${name}`, 'unknown-tool'); @@ -1315,6 +1325,7 @@ async function haandterKald(request) { // ligger i - ellers det der er forrest og altsaa modtager // klikket eller tastetrykket. let targetBundleId = null; + let koerendeMaal = null; if (tool.tier !== TIER.READ || (name === 'computer_screenshot' && args.redact === false)) { // ⛔ RETTET 21/9. Hvis kaldet NAVNGIVER et program, er det programmet // der rammes - ikke det der tilfaeldigvis er forrest. Foer i dag @@ -1325,6 +1336,8 @@ async function haandterKald(request) { targetBundleId = args.app ? await resolveBundleId(args.app) : await frontmostBundleId(); + // R17: et navngivet program porten fandt blandt de koerende (ikke intent, ikke disk). + if (args.app) koerendeMaal = targetBundleId; // Doeren navngiver sit maal via intent'et (ikke via args.app), saa porten // ser den rigtige app - ikke det der tilfaeldigvis er forrest - og ikke // kalder den "ukendt maal" og spoerger. Et ugyldigt intent giver null, som @@ -1456,6 +1469,9 @@ async function haandterKald(request) { return errorResult(`Refused: ${grund}. It is where the person watches the agents and answers them; an agent may not press anything in it.`); } + // R17: fra her rammer alt det koerende program porten vurderede - se appArg. + if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal; + // `computer_ask_user` viser selv en dialog til mennesket - den ER // samtykke-oejeblikket. Spurgte porten foerst, ville mennesket faa to // dialoger for ét spoergsmaal. Den er stadig WRITE-niveau, saa den er skjult @@ -1534,7 +1550,7 @@ async function haandterKald(request) { 'computer_click', 'computer_press', 'computer_set_value', 'computer_menu']); if (baggrund() && ROERER_I_PROGRAMMET.has(name) && args.app && (!KAN_STILLES.has(name) || kaldErStille(name, args))) { - const maal = await resolveApp(args.app); + const maal = await resolveApp(appArg(args)); if (maal?.active) { const t0 = TOOL_BY_NAME.get(name); const grund0 = 'background mode: the named app is the one the person is using right now'; @@ -1654,7 +1670,7 @@ async function haandterKald(request) { } const menuFarlig = name === 'computer_menu' && effektivTier !== TIER.READ - && (menuSerFarlig(args.path) || await menuGenvejErFarlig(args.app, args.path)); + && (menuSerFarlig(args.path) || await menuGenvejErFarlig(appArg(args), args.path)); const knapFarlig = effektivTier !== TIER.READ && !kunLaes && ( name === 'computer_press' ? !!trykDom?.farlig : name === 'computer_click' ? await knapErFarlig(name, args) : false); @@ -1827,7 +1843,7 @@ async function haandterKald(request) { } if (!(verdict.allow && verdict.asker === 'menubar' && baggrund() && args.app && ROERER_I_PROGRAMMET.has(name))) return null; - const nu = await resolveApp(args.app); + const nu = await resolveApp(appArg(args)); if (nu && !nu.active && nu.bundleId === targetBundleId) return null; return nu?.active ? 'the person approved, but the app became the one they are using while they answered' diff --git a/test/baggrund-stille.mjs b/test/baggrund-stille.mjs index 014e5477..ce7ea313 100644 --- a/test/baggrund-stille.mjs +++ b/test/baggrund-stille.mjs @@ -143,7 +143,8 @@ try { !/Refused/.test(t2), t2.slice(0, 80)); await VAGT.roligt(300); check('...og naar hjaelperen (i attrappen: noteret, ikke udfoert)', - VAGT.handlingerNaaedeFrem().some(k => k.argv[0] === 'scroll' && k.argv.includes('Finder')), + // R17: porten binder det koerende maal - hjaelperen faar Finders id, ikke navnet. + VAGT.handlingerNaaedeFrem().some(k => k.argv[0] === 'scroll' && k.argv.includes('=com.apple.finder')), 'om skaermen blev roert, maales i stille-vej.mjs mod proevens EGET program'); // 5. ⛔ DEN VIGTIGSTE. Naar kaldet navngiver et program, skal faren diff --git a/test/bundet-maal.mjs b/test/bundet-maal.mjs new file mode 100644 index 00000000..a234d318 --- /dev/null +++ b/test/bundet-maal.mjs @@ -0,0 +1,100 @@ +// BUNDET MAAL: det program porten vurderede, er det program handlingen rammer. +// +// ⛔ R17 (Astra + Opus, enige 9/10): navnet blev fortolket to gange - af porten og igen +// af hjaelperen. Selv med samme regel kunne de to vaelge forskelligt (listen aendrer +// sig imellem; to processer med samme id). Nu faar alt efter porten det valgte id som +// `=`, og hjaelperen slaar kun det praecise id op. Opstart af et LUKKET program +// beholder navnet (et id ville lade Launch Services vaelge enhver kopi der paastaar det). +// +// Gennem den rigtige server, med en attrap-hjaelper der skriver hvert kald ned. +// Intet rammer skaermen. +import './ryd-op.mjs'; +import './egen-tilstand.mjs'; +import { spawn } from 'node:child_process'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { mkdtempSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { lavFalskHjaelper } from './falsk-hjaelper.mjs'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; +const LRM = '‎'; + +function klient(svar) { + const hj = lavFalskHjaelper('cmcp-bundet'); + hj.saetSvar(svar); + const env = { ...process.env, CMCP_MODE: 'allow', CMCP_HELPER: hj.sti, + CMCP_STATE_DIR: mkdtempSync(join(tmpdir(), 'cmcp-bundet-')) }; + delete env.CMCP_BACKGROUND; // standarden: baggrund + const srv = spawn('node', [join(ROOT, 'mcp-server', 'index.js')], { env, stdio: ['pipe', 'pipe', 'pipe'] }); + let buf = ''; const venter = new Map(); let n = 0; + srv.stdout.on('data', (d) => { + buf += d; let i; + while ((i = buf.indexOf('\n')) >= 0) { + const l = buf.slice(0, i); buf = buf.slice(i + 1); + if (!l.trim()) continue; + try { const m = JSON.parse(l); venter.get(m.id)?.(m); venter.delete(m.id); } catch { /* videre */ } + } + }); + const rpc = (method, params) => new Promise((res, rej) => { + const id = ++n; venter.set(id, res); + srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n'); + setTimeout(() => rej(new Error('timeout ' + method)), 20000); + }); + const kald = async (name, args) => { + const r = await rpc('tools/call', { name, arguments: args }); + return { tekst: (r.result?.content || []).map(c => c.text || '').join('\n'), fejl: !!r.result?.isError }; + }; + return { srv, rpc, kald, hj }; +} +const appArgv = (k) => { const i = k.argv.indexOf('--app'); return i >= 0 ? k.argv[i + 1] : undefined; }; + +// 1 · et koerende program navngivet med sit (usynlige) navn +{ + const { srv, rpc, kald, hj } = klient({ apps: { apps: [ + { name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: false }, + { name: 'TextEdit', bundleId: 'com.apple.TextEdit', pid: 3302, active: true }, + { name: `${LRM}Notes`, bundleId: 'com.apple.Notes', pid: 3303, active: false }, + ] } }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + const r = await kald('computer_key', { app: 'Notes', combo: 'cmd+b' }); + const tast = hj.kald().filter(k => k.argv[0] === 'key'); + check('1a porten fandt Notes, og hjaelperen fik det BUNDNE id - ikke navnet', tast.length === 1 && appArgv(tast[0]) === '=com.apple.Notes', + JSON.stringify(tast.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 120)); + check('1b agentens tekst beholder navnet (intet «=» i svaret)', !/=com\.apple\.Notes/.test(r.tekst), r.tekst.slice(0, 160)); + srv.kill(); +} + +// 2 · et LUKKET program startes: navnet beholdes +{ + const { srv, rpc, kald, hj } = klient({ + apps: { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: true }] }, + 'resolve-app': { app: 'Calculator', bundleId: 'com.apple.calculator', path: '/System/Applications/Calculator.app', running: false }, + }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + const r = await kald('computer_launch', { app: 'Calculator', background: true }); + const start = hj.kald().filter(k => k.argv[0] === 'launch'); + check('2 opstart af et lukket program: hjaelperen faar navnet, ikke et bundet id', start.length === 1 && appArgv(start[0]) === 'Calculator', + JSON.stringify(start.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 120)); + srv.kill(); +} + +// 3 · to processer med samme id - den aktive er menneskets (Opus P2). Den aktive staar +// SIDST, saa et opslag der kun ser paa den foerste proces med id'et, ville sige ja. +{ + const { srv, rpc, kald, hj } = klient({ apps: { apps: [ + { name: 'Wanted', bundleId: 'dk.same', pid: 101, active: false }, + { name: 'Other', bundleId: 'dk.same', pid: 100, active: true }, + ] } }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + const r = await kald('computer_key', { app: 'Wanted', combo: 'cmd+b' }); + const tast = hj.kald().filter(k => k.argv[0] === 'key'); + check('3 en anden proces med samme id er den mennesket bruger: afvist, intet tastet', r.fejl && tast.length === 0, + JSON.stringify(tast.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 160)); + srv.kill(); +} + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index f024f563..97baf795 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -24,12 +24,14 @@ const ARB = mkdtempSync(join(tmpdir(), 'cmcp-ikon-boks-')); writeFileSync(join(ARB, 'main.swift'), `import Foundation import CoreGraphics struct Ag: Decodable { let navn: String; let maal: String?; let nu: String } -struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; let menuKnapper: [String] } +struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; let fakta: [String]; let menuKnapper: [String] } +struct Hd: Decodable { let knap: String; let knapNonce: String?; let visteNonce: String?; let aktive: Bool } +struct Ak: Decodable { let siden: Double; let iGang: Bool } struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V? } struct R: Decodable { let x: Double; let y: Double; let w: Double; let h: Double } struct S: Decodable { let vindue: R?; let mus: [Double]; let skaerme: [R] } struct H: Decodable { let synlig: R; let bredde: Double } -struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R]; let hjoerne: [H] } +struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R]; let hjoerne: [H]; let handling: [Hd]; let aktive: [Ak] } let raa = FileHandle.standardInput.readDataToEndOfFile() let ind = try! JSONDecoder().decode(Ind.self, from: raa) // CGWindowList-lister som macOS giver dem: NSNumber og NSDictionary (via JSONSerialization). @@ -39,7 +41,7 @@ let r = { (a: R) in CGRect(x: a.x, y: a.y, width: a.w, height: a.h) } let ud: [String: Any] = [ "indhold": ind.indhold.map { i -> [String: Any] in let b = boksIndhold(arbejder: i.arbejder.map { (navn: $0.navn, maal: $0.maal, nu: $0.nu) }, tilsluttede: i.tilsluttede, - venter: i.venter.map { (antal: $0.antal, klient: $0.klient, tekst: $0.tekst, menuKnapper: $0.menuKnapper) }) + venter: i.venter.map { (antal: $0.antal, klient: $0.klient, tekst: $0.tekst, fakta: $0.fakta, menuKnapper: $0.menuKnapper) }) return ["titel": b.titel, "orange": b.orange, "linjer": b.linjer, "knapper": b.knapper] }, "skaerm": ind.skaerm.map { s in boksSkaerm(forrestVindue: s.vindue.map(r), mus: CGPoint(x: s.mus[0], y: s.mus[1]), skaerme: s.skaerme.map(r)) }, "cocoa": ind.cocoa.map { c in let x = cocoaRamme(r(c), hovedHoejde: 1112); return [x.minX, x.minY, x.width, x.height] }, @@ -48,12 +50,19 @@ let ud: [String: Any] = [ let pid = (l["pid"] as! NSNumber).int32Value guard let v = forrestVinduesRamme(l["liste"] as! [[String: Any]], pid: pid) else { return NSNull() } return [v.minX, v.minY, v.width, v.height] }, + "handling": ind.handling.map { h -> String in + switch boksHandling(knap: h.knap, knapNonce: h.knapNonce, visteNonce: h.visteNonce, aktive: h.aktive) { + case .foelg: return "foelg"; case .tillad(let n): return "tillad:" + n; case .afvis(let n): return "afvis:" + n + case .gjort(let n): return "gjort:" + n; case .hentFrem(let n): return "hentFrem:" + n; case .intet: return "intet" } }, + "aktive": ind.aktive.map { boksKnapperAktive(sidenNytSpoergsmaal: $0.siden, touchIdIGang: $0.iGang) }, + "pause": BOKS_PAUSE, "max": BOKS_MAX_TEGN] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); const BIN = join(ARB, 'boks'); execFileSync('swiftc', [join(KILDE, 'Tekst.swift'), join(ARB, 'main.swift'), '-o', BIN], { stdio: 'pipe', timeout: 300000 }); const ALLOW_MENU = 'Allow… (confirm with Touch ID)'; +const SCOPE = 'If you allow it, the agent may work in com.apple.Terminal for the rest of this session.'; const lang = 'Send the quarterly numbers to the board. '.repeat(8); // > 280 tegn // Gustavs to skaerme: MacBook 1710x1112 forrest (hovedskaerm), ultrabred 3440x1440 til hoejre. const MAC = { x: 0, y: 0, w: 1710, h: 1112 }, BRED = { x: 1710, y: -200, w: 3440, h: 1440 }; @@ -61,11 +70,12 @@ const ind = { indhold: [ { arbejder: [{ navn: 'Claude · c753', maal: 'com.apple.Notes', nu: 'Press «Format» in Noter' }, { navn: 'Codex · 9f1', maal: null, nu: 'idle' }], tilsluttede: 12, venter: null }, { arbejder: Array.from({ length: 5 }, (_, i) => ({ navn: `a${i}`, maal: null, nu: 'x' })), tilsluttede: 5, venter: null }, - { arbejder: [], tilsluttede: 3, venter: { antal: 1, klient: 'Claude', tekst: 'Press cmd+backspace in Noter', menuKnapper: [ALLOW_MENU, 'Deny'] } }, - { arbejder: [], tilsluttede: 3, venter: { antal: 3, klient: 'Claude', tekst: lang, menuKnapper: [ALLOW_MENU, 'Deny'] } }, - { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: null, tekst: 'Type your password in Safari', menuKnapper: ['Take me there', 'Done — I did it', "I won't do this"] } }, - { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Use your screen for 2 minutes', menuKnapper: ['Deny'] } }, - { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude‮', tekst: 'x'.repeat(280), menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 3, venter: { antal: 1, klient: 'Claude', tekst: 'Press cmd+backspace in Noter', fakta: ['If you allow it, this one action only.', 'Lands in: com.apple.Notes'], menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 3, venter: { antal: 3, klient: 'Claude', tekst: lang, fakta: [], menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: null, tekst: 'Type your password in Safari', fakta: [], menuKnapper: ['Take me there', 'Done — I did it', "I won't do this"] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Use your screen for 2 minutes', fakta: [], menuKnapper: ['Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude‮', tekst: 'x'.repeat(280), fakta: [], menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Type 42 characters', fakta: [SCOPE, 'Lands in: com.apple.Terminal'], menuKnapper: [ALLOW_MENU, 'Deny'] } }, ], skaerm: [ { vindue: { x: 1800, y: 100, w: 1400, h: 900 }, mus: [100, 100], skaerme: [MAC, BRED] }, // vinduet paa den brede, musen paa Mac'en @@ -75,6 +85,19 @@ const ind = { { vindue: { x: 9000, y: 9000, w: 10, h: 10 }, mus: [4000, 500], skaerme: [MAC, BRED] }, // vindue uden for alle: musen ], cocoa: [{ x: 0, y: 0, w: 100, h: 50 }, { x: 1800, y: 34, w: 1200, h: 800 }], + handling: [ + { knap: 'Allow (Touch ID)', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: 'Allow (Touch ID)', knapNonce: 'n0', visteNonce: 'n1', aktive: true }, + { knap: 'Allow (Touch ID)', knapNonce: 'n1', visteNonce: 'n1', aktive: false }, + { knap: 'Deny', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: "I won't do this", knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: 'Done — I did it', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: 'Take me there', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: 'Follow', knapNonce: null, visteNonce: null, aktive: false }, + { knap: 'Allow (Touch ID)', knapNonce: null, visteNonce: null, aktive: true }, + { knap: 'Allow… (confirm with Touch ID)', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + ], + aktive: [{ siden: 0.5, iGang: false }, { siden: 1.0, iGang: false }, { siden: 5, iGang: true }, { siden: 5, iGang: false }], hjoerne: [{ synlig: { x: 0, y: 0, w: 1710, h: 1077 }, bredde: 360 }, { synlig: { x: 1710, y: -200, w: 3440, h: 1415 }, bredde: 360 }], vinduer: (() => { const v = (pid, lag, X) => ({ kCGWindowOwnerPID: pid, kCGWindowLayer: lag, kCGWindowBounds: { X, Y: 40, Width: 500, Height: 300 } }); @@ -86,12 +109,16 @@ const ind = { })(), }; const s = JSON.parse(execFileSync(BIN, { input: JSON.stringify(ind), encoding: 'utf8' })); -const [n2, n5, q1, qLang, qSelv, qLaan, qGraense] = s.indhold; +const [n2, n5, q1, qLang, qSelv, qLaan, qGraense, qTerm] = s.indhold; check('1a to agenter: titlen siger hvor mange der arbejder, og hvor mange der er tilsluttet', n2.titel === 'Computer MCP - 2 agents working · 12 connected' && !n2.orange, n2.titel); check('1b hver agent: navn, program og hvad den goer nu', n2.linjer[0] === '● Claude · c753 · com.apple.Notes' && n2.linjer[1].trim() === 'Press «Format» in Noter' && n2.linjer[2] === '● Codex · 9f1', JSON.stringify(n2.linjer)); check('1c hoejst tre agenter, resten som et tal', n5.linjer.filter(l => l.startsWith('●')).length === 3 && n5.linjer.at(-1) === '+2 more working', JSON.stringify(n5.linjer)); check('1d «Follow» naar nogen arbejder', JSON.stringify(n2.knapper) === '["Follow"]'); -check('2a et spoergsmaal: orange, hvem der spoerger, og HELE teksten', q1.orange && q1.titel === 'Claude needs you' && q1.linjer.join(' ') === 'Press cmd+backspace in Noter', JSON.stringify(q1)); +check('2a et spoergsmaal: orange, hvem der spoerger, og HELE teksten', q1.orange && q1.titel === 'Claude needs you' && q1.linjer[0] === 'Press cmd+backspace in Noter', JSON.stringify(q1)); +check('2h ...og HVOR det lander og HVOR LAENGE et ja gaelder - menuens fakta, hele (R17, Opus 4c)', + q1.linjer.includes('If you allow it, this one action only.') && q1.linjer.includes('Lands in: com.apple.Notes') + && qTerm.linjer.slice(1, -1).join(' ') === SCOPE && qTerm.linjer.at(-1) === 'Lands in: com.apple.Terminal' + && JSON.stringify(qTerm.knapper) === '["Allow (Touch ID)","Deny"]', JSON.stringify(qTerm.linjer)); check('2b ...med menuens knapper: Allow (Touch ID) og Deny', JSON.stringify(q1.knapper) === '["Allow (Touch ID)","Deny"]', JSON.stringify(q1.knapper)); check(`2c over ${s.max} tegn: ingen Allow i boksen, og den siger hvor hele teksten er`, !qLang.knapper.includes('Allow (Touch ID)') && qLang.knapper.includes('Deny') @@ -109,13 +136,22 @@ check('3e det forreste programs forreste almindelige vindue - ikke et andet prog check('3c vinduets ramme omregnes fra oeverst-venstre til Cocoas nederst-venstre', JSON.stringify(s.cocoa) === JSON.stringify([[0, 1062, 100, 50], [1800, 278, 1200, 800]]), JSON.stringify(s.cocoa)); +check('6a knapperne: Allow -> Touch ID-vejen paa KNAPPENS spoergsmaal; Deny og «I won\'t» er nej; Done er gjort; Take me there henter frem', + JSON.stringify(s.handling.slice(0, 7)) === JSON.stringify(['tillad:n1', 'intet', 'intet', 'afvis:n1', 'afvis:n1', 'gjort:n1', 'hentFrem:n1']), JSON.stringify(s.handling)); +check('6b Follow virker altid; uden spoergsmaal eller med en ukendt knap sker intet', + JSON.stringify(s.handling.slice(7)) === JSON.stringify(['foelg', 'intet', 'intet']), JSON.stringify(s.handling.slice(7))); +check(`6c knapperne venter ${s.pause} s efter et nyt spoergsmaal og er fra mens Touch ID er oppe`, + JSON.stringify(s.aktive) === '[false,true,false,true]', JSON.stringify(s.aktive)); + // 4 · det rigtige ikon: --dump-question bygger boksen med samme funktion som den rigtige boks const ikon = [join(ROOT, 'helper', '.build', 'release', 'cmcp-status'), join(ROOT, 'mcp-server', 'vendor', 'ComputerMCPStatus.app', 'Contents', 'MacOS', 'cmcp-status')].find(p => existsSync(p)); if (!ikon) console.log('SPR. 4 intet bygget ikon'); else { const vis = (q) => JSON.parse(execFileSync(ikon, ['--dump-question'], { encoding: 'utf8', input: JSON.stringify({ nonce: 'n', session: 's', client: 'Claude', scope: 'If you allow it, this one action only.', target: 'com.apple.Notes', expires: 0, ...q }) })).box; const b = vis({ text: 'Press cmd+backspace in Noter' }); - check('4a ikonet: spoergsmaalet i boksen med Allow (Touch ID) og Deny', b.title === 'Claude needs you' && JSON.stringify(b.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(b)); + check('4a ikonet: spoergsmaalet i boksen med hvor det lander og omfanget, og Allow (Touch ID) og Deny', + b.title === 'Claude needs you' && b.lines.includes('Lands in: com.apple.Notes') && b.lines.includes('If you allow it, this one action only.') + && JSON.stringify(b.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(b)); const l = vis({ text: 'Use your screen for 2 minutes: F1', kind: 'screen', minutes: 2, simulateActiveLoan: { client: 'anden', minutesLeft: 3 } }); check('4b ikonet: et andet laan er aktivt - boksen har kun Deny', JSON.stringify(l.buttons) === '["Deny"]', JSON.stringify(l)); } @@ -125,23 +161,28 @@ const m = readFileSync(join(KILDE, 'main.swift'), 'utf8'); const krop = (start) => { const i = m.indexOf(start); return i < 0 ? '' : m.slice(i, m.indexOf('\n }\n', i)); }; const knapKrop = krop('func boksKnapTrykket('); check('5a boksens Allow er menuens tilladNonce - samme vej, med sit eget kildemaerke', - /case "Allow \(Touch ID\)": tilladNonce\(n, kilde: "allow-box"\)/.test(knapKrop), knapKrop.slice(0, 200)); + /case \.tillad\(let n\): tilladNonce\(n, kilde: "allow-box"\)/.test(knapKrop) && /case \.afvis\(let n\): afvisNonce\(n, kilde: "deny-box"\)/.test(knapKrop) + && /case \.gjort\(let n\): gjortNonce\(n, kilde: "done-box"\)/.test(knapKrop) && /case \.hentFrem\(let n\): hentFremNonce\(n\)/.test(knapKrop), knapKrop.slice(0, 300)); check('5b menuens Allow gaar samme vej', /@objc func tillad\(_ sender: NSMenuItem\) \{ tilladNonce\(sender\.representedObject as\? String, kilde: "allow"\) \}/.test(m)); const tillad = krop('func tilladNonce('); check('5c et ja kraever Touch ID: intet svar foer bekraeftMenneske, og et ja i boksen kun naar HELE teksten stod der', - /if kilde == "allow-box" && renTekst\(a\.s\.text\)\.count > BOKS_MAX_TEGN \{ return \}\n\s+bekraeftMenneske\(a\) \{/.test(tillad) + /if kilde == "allow-box" && renTekst\(a\.s\.text\)\.count > BOKS_MAX_TEGN \{ return \}\n\s+boks\.touchIdIGang = true\n\s+bekraeftMenneske\(a\) \{/.test(tillad) && !/svar\(ok: true|svarLaan/.test(tillad.slice(0, tillad.indexOf('bekraeftMenneske(a)'))), tillad.slice(0, 300)); check('5c2 svaret er Touch ID-svaret: et nej er et nej (aldrig svar(ok: true))', /\} else \{\n\s+a\.svar\(ok: ok\)\n/.test(tillad) && !/svar\(ok: true/.test(tillad)); check('5c3 et spoergsmaal findes kun paa sit eget engangsnummer', /func aaben\(_ nonce: String\?\) -> Anmodning\? \{\n\s+guard let n = nonce else \{ return nil \}\n\s+return anmodninger\.first \{ \$0\.s\.nonce == n && !\$0\.besvaret \}\n\s+\}/.test(m)); -check('5d hver knap boksen kan vise, har en handling', ['Follow', 'Allow (Touch ID)', 'Done — I did it', 'Take me there', 'Deny', "I won't do this"] - .every(k => knapKrop.includes(`"${k}"`))); -check('5e hver knap baerer sit eget spoergsmaal, og et klik fra en aeldre visning goer intet (R17, Astra)', +check('5d boksens tryk afgoeres af boksHandling med den viste nonce og om knapperne er aktive', + /switch boksHandling\(knap: knap, knapNonce: n, visteNonce: boks\.nonce, aktive: boks\.knapperAktive\(\)\) \{/.test(knapKrop)); +check('5k Touch ID: knapperne slaas fra foer arket og til igen naar det svarer', + /boks\.touchIdIGang = true\n\s+bekraeftMenneske\(a\) \{ \[weak self\] ok in\n\s+self\?\.boks\.touchIdIGang = false/.test(m)); +check('5l pausen: et nyt spoergsmaal saetter tiden, og knapperne foelger knapperAktive', + /if ny != nonce && ny != nil \{\n\s+nytSpoergsmaal = Date\(\)/.test(m) && /let aktiv = nonce == nil \|\| knapperAktive\(\)/.test(m)); +check('5m boksen viser det FOERSTE aabne spoergsmaal og bruger dets nonce', /let foerste = aabne\.first/.test(m) && /nonce: foerste\?\.s\.nonce, sessioner: aktive/.test(m)); +check('5e hver knap baerer sit eget spoergsmaal (R17, Astra)', /vist = ind; nonce = ny/.test(m) && /b\.identifier = NSUserInterfaceItemIdentifier\("boks-" \+ \(ny \?\? ""\)\)/.test(m) - && /knapTrykket\(b\.title, id\.count > 5 \? String\(id\.dropFirst\(5\)\) : nil\)/.test(m) - && /func boksKnapTrykket\(_ knap: String, nonce n: String\?\) \{\n(\s+\/\/[^\n]*\n)*\s+if knap != "Follow" && \(n == nil \|\| n != boks\.nonce\) \{ return \}\n\s+switch knap \{/.test(m)); -check('5f boksen faar menuens knapper for spoergsmaalet', /menuKnapper: spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)\.knapper/.test(m) + && /knapTrykket\(b\.title, id\.count > 5 \? String\(id\.dropFirst\(5\)\) : nil\)/.test(m)); +check('5f boksen faar menuens knapper OG fakta for spoergsmaalet', /let mm = spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)\n\s+return \(antal: aabne\.count, klient: a\.s\.client, tekst: a\.s\.text, fakta: mm\.fakta, menuKnapper: mm\.knapper\)/.test(m) && /let mm = spoergsmaalMenu\(a\.s, aktivtAndetLaan: andetLaan\(a\)\)/.test(m)); check('5g placeringen: skaermen med det forreste vindue, hjoernet fra boksHjoerne', /let i = boksSkaerm\(forrestVindue: forrestVindue\(\), mus: NSEvent\.mouseLocation, skaerme: skaerme\.map \{ \$0\.frame \}\)\n\s+let f = skaerme\[i\]\.visibleFrame\n\s+setFrameTopLeftPoint\(boksHjoerne\(synlig: f, bredde: frame\.width\)\)/.test(m)); diff --git a/test/ikon-menu.mjs b/test/ikon-menu.mjs index bec83294..48f15a5a 100644 --- a/test/ikon-menu.mjs +++ b/test/ikon-menu.mjs @@ -59,7 +59,7 @@ check('3 ...og mens det gaelder: hvem, hvor laenge, og «Take the screen back no // 9/10: boksen viser spoergsmaalet HELT og har menuens knapper (test/ikon-boks.mjs maaler resten). const bx = vis({ text: 'Use your screen for 5 minutes: live-proeve', kind: 'screen', minutes: 5 }).box || {}; check('3c boksen siger at et spoergsmaal venter, og hvem der spoerger', bx.orange === true && /needs you/i.test(bx.title || ''), JSON.stringify(bx)); -check('3c ...og hvad det gaelder, helt', (bx.lines || []).join(' ') === 'Use your screen for 5 minutes: live-proeve', JSON.stringify(bx)); +check('3c ...og hvad det gaelder, helt - og hvor det lander', (bx.lines || [])[0] === 'Use your screen for 5 minutes: live-proeve' && (bx.lines || []).some(l => l.startsWith('Lands in:')), JSON.stringify(bx)); check('3c ...med Allow (Touch ID) og Deny', JSON.stringify(bx.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(bx)); check('3b laanet kan aldrig vaere over 15 minutter i ikonet', /for 15 minutes/.test(vis({ text: 'x', kind: 'screen', minutes: 99 }).touchId)); diff --git a/test/run-all.sh b/test/run-all.sh index 635c0f20..8d0a9a3c 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -156,6 +156,8 @@ run "hele teksten i menuen" "node test/ombryd.mjs" run "lyd pr. spoergsmaal" "node test/ikon-lyd.mjs" # ⛔ 9/10: boksen stod paa den anden skaerm og sagde kun «Needs you» - et spoergsmaal udloeb. run "boksen i hjoernet" "node test/ikon-boks.mjs" +# ⛔ R17 (9/10): porten og hjaelperen fortolkede navnet hver for sig - nu faar leveringen portens id. +run "bundet maal" "node test/bundet-maal.mjs" # ⛔ 9/10: «\u200eWhatsApp» - app "WhatsApp" blev «ukendt maal» og afvist. run "usynlige navne" "node test/usynlige-navne.mjs" # ⛔ 29/9: goer-selv, skaerm-laanet og den fulde tekst var kun kompileret i ikonet, aldrig koert. diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index a284e360..9a5679af 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -59,10 +59,22 @@ const APPS = [ ]; // A3 · oversaettelsen ved hjaelperens indgang: [argv, opslag, forventet argv, hvad] const OVERSAET = [ - [['h', 'find', '--app', 'WhatsApp', '--role', 'AXButton'], { WhatsApp: 'net.whatsapp.WhatsApp' }, ['h', 'find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton'], 'navnet bliver til id'], - [['h', 'find', '--app', '--role', 'AXButton'], { '--role': 'x' }, ['h', 'find', '--app', '--role', 'AXButton'], '--app uden vaerdi roeres ikke'], - [['h', 'find', '--app', 'Ukendt'], {}, ['h', 'find', '--app', 'Ukendt'], 'intet opslag: uroert'], - [['h', 'windows', '--app'], { '': 'x' }, ['h', 'windows', '--app'], '--app sidst roeres ikke'], + [['h', 'find', '--app', 'WhatsApp', '--role', 'AXButton'], { WhatsApp: 'net.whatsapp.WhatsApp' }, [], ['h', 'find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton'], 'navnet bliver til id'], + [['h', 'find', '--app', '--role', 'AXButton'], { '--role': 'x' }, [], ['h', 'find', '--app', '--role', 'AXButton'], '--app uden vaerdi roeres ikke'], + [['h', 'find', '--app', 'Ukendt'], {}, [], ['h', 'find', '--app', 'Ukendt'], 'intet opslag: uroert'], + [['h', 'windows', '--app'], { '': 'x' }, [], ['h', 'windows', '--app'], '--app sidst roeres ikke'], + // R17: et maal porten har bundet (`=`) - kun det praecise id, ellers intet + [['h', 'type', '--app', '=net.whatsapp.WhatsApp'], {}, ['net.whatsapp.WhatsApp'], ['h', 'type', '--app', 'net.whatsapp.WhatsApp'], 'bundet id der koerer: det praecise id'], + [['h', 'type', '--app', '=net.whatsapp.WhatsApp'], { '=net.whatsapp.WhatsApp': 'dk.andet', 'net.whatsapp.WhatsApp': 'dk.andet' }, [], null, 'bundet id der ikke koerer: intet - aldrig et navneopslag'], + [['h', 'type', '--app', '=NET.whatsapp.WhatsApp'], {}, ['net.whatsapp.WhatsApp'], null, 'bundet id med andre store/smaa: intet'], + [['h', 'type', '--app', '='], {}, [''], null, 'tomt bundet id: intet'], +]; +// R17 · serverens side af det bundne maal: [apps (id, navn), oenske, forventet indeks] +const BUNDNE = [ + [[['dk.a', 'X'], ['dk.b', 'Y']], '=dk.b', 1, 'det praecise id'], + [[['DK.A', 'X']], '=dk.a', null, 'andre store/smaa: intet'], + [[['dk.z', 'dk.a']], '=dk.a', null, 'et program der HEDDER som id\'et: intet'], + [[['dk.a', 'X']], '=', null, 'tomt: intet'], ]; const { findProgram } = await import(join(ROOT, 'mcp-server', 'helper.js')); @@ -90,7 +102,7 @@ const ARB = mkdtempSync(join(tmpdir(), 'cmcp-usynlige-navne-')); writeFileSync(join(ARB, 'main.swift'), `import Foundation struct N: Decodable { let navne: [String]; let want: String } struct A: Decodable { let ids: [String?]; let navne: [String?]; let want: String } -struct O: Decodable { let argv: [String]; let opslag: [String: String] } +struct O: Decodable { let argv: [String]; let opslag: [String: String]; let findes: [String] } struct Ind: Decodable { let navne: [N]; let apps: [A]; let oversaet: [O] } let ind = try! JSONDecoder().decode(Ind.self, from: FileHandle.standardInput.readDataToEndOfFile()) func tal(_ v: Navne.Valg) -> Any { if case .fundet(let i) = v { return i }; return NSNull() } @@ -105,7 +117,8 @@ let ud: [String: Any] = [ "navne": ind.navne.map { tal(Navne.vaelg($0.navne, $0.want)) }, "tvetydig": ind.navne.map { Navne.vaelg($0.navne, $0.want) == .tvetydig }, "apps": ind.apps.map { tal(Navne.vaelgApp(ids: $0.ids, navne: $0.navne, want: $0.want)) }, - "oversaet": ind.oversaet.map { o in Navne.oversaet(o.argv) { o.opslag[$0] } }, + "oversaet": ind.oversaet.map { o -> Any in Navne.oversaet(o.argv, slaaOp: { o.opslag[$0] }, findesPraecist: { o.findes.contains($0) }) ?? NSNull() }, + "id": [Navne.id(bundleId: nil, pid: 5), Navne.id(bundleId: "", pid: 6), Navne.id(bundleId: "dk.a", pid: 7)], "trim": trim, "cf": cf, "smaa": smaa] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); @@ -114,7 +127,7 @@ execFileSync('swiftc', ['-O', join(KILDE, 'Navne.swift'), join(ARB, 'main.swift' const sw = JSON.parse(execFileSync(BIN, { encoding: 'utf8', maxBuffer: 64 << 20, timeout: 300000, input: JSON.stringify({ navne: NAVNE.map(([navne, want]) => ({ navne, want })), apps: APPS.map(([ids, navne, want]) => ({ ids, navne, want })), - oversaet: OVERSAET.map(([argv, opslag]) => ({ argv, opslag })), + oversaet: OVERSAET.map(([argv, opslag, findes]) => ({ argv, opslag, findes })), }) })); NAVNE.forEach(([, , forventet, hvad], i) => { @@ -125,8 +138,13 @@ APPS.forEach(([, , , forventet, hvad], i) => { check(`1a.${i + 1} serveren (id+navn): ${hvad}`, jsApps[i] === forventet, `fik ${jsApps[i]}, ventede ${forventet}`); check(`2a.${i + 1} hjaelperen (id+navn): ${hvad}`, sw.apps[i] === forventet, `fik ${sw.apps[i]}, ventede ${forventet}`); }); +BUNDNE.forEach(([apps, want, forventet, hvad], i) => { + const liste = apps.map(([bundleId, name]) => ({ bundleId, name })); + const hit = findProgram(liste, want); + check(`1b.${i + 1} serveren, bundet maal: ${hvad}`, (hit ? liste.indexOf(hit) : null) === forventet, JSON.stringify(hit)); +}); check('2b et tvetydigt navn er sit eget svar i hjaelperen (ingen faldbag til disken)', sw.tvetydig[1] === true && sw.tvetydig[0] === false); -OVERSAET.forEach(([, , forventet, hvad], i) => +OVERSAET.forEach(([, , , forventet, hvad], i) => check(`2c.${i + 1} oversaettelsen ved indgangen: ${hvad}`, JSON.stringify(sw.oversaet[i]) === JSON.stringify(forventet), JSON.stringify(sw.oversaet[i]))); const forskel = (a, b) => { const s = new Set(b.map(String)); const t = new Set(a.map(String)); return [...a.filter(x => !s.has(String(x))), ...b.filter(x => !t.has(String(x)))].slice(0, 6); }; @@ -144,10 +162,11 @@ const src = Object.fromEntries(kilder.map(f => [f, readFileSync(join(KILDE, f), const ax = src['Accessibility.swift'], mainSwift = src['main.swift']; check('6a AX.app er opslaget og intet andet', /static func app\(bundleId: String\) -> NSRunningApplication\? \{ appOpslag\(bundleId\)\.app \}/.test(ax)); check('6a2 opslaget vaelger med Navne.vaelgApp og returnerer netop det valgte - intet foer det (R17, Astra A17)', - /static func appOpslag\(_ hvad: String\) -> \(app: NSRunningApplication\?, tvetydig: Bool\) \{\n\s+let alle = allApps\(\)\n\s+switch Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); + /static func appOpslag\(_ hvad: String\) -> \(app: NSRunningApplication\?, tvetydig: Bool\) \{\n\s+let alle = allApps\(\)\n\s+\/\/[^\n]*\n\s+if hvad\.hasPrefix\("pid:"\) \{ return \(alle\.first \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) == hvad \}, false\) \}\n\s+switch Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); check('6b programmer paa disken: praecist filnavn, ellers Navne.vaelg over HELE listen og netop det valgte (R17, Astra A18)', /if FileManager\.default\.fileExists\(atPath: k\.path\) \{ return k \}\n\s+\}\n(\s+\/\/[^\n]*\n)*\s+var fund: \[URL\] = \[\]\n\s+for m in mapper \{\n\s+for f in \(try\? FileManager\.default\.contentsOfDirectory\(atPath: m\)\) \?\? \[\] where f\.hasSuffix\("\.app"\) \{\n\s+fund\.append\(URL\(fileURLWithPath: m\)\.appendingPathComponent\(f\)\)\n\s+\}\n\s+\}\n\s+/.test(ax) && /guard case \.fundet\(let i\) = Navne\.vaelg\(fund\.map \{ \$0\.deletingPathExtension\(\)\.lastPathComponent \}, hvad\) else \{ return nil \}\n\s+return fund\[i\]/.test(ax)); -check('6c --app oversaettes ét sted, foer alle kommandoer', /^let args = Args\(Navne\.oversaet\(CommandLine\.arguments\) \{ AX\.app\(bundleId: \$0\)\?\.bundleIdentifier \}\)/m.test(mainSwift)); +check('6c --app oversaettes ét sted, foer alle kommandoer, og et bundet maal der er vaek er en fejl', + /^guard let oversatArgv = Navne\.oversaet\(CommandLine\.arguments, slaaOp: \{ AX\.app\(bundleId: \$0\)\.map \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) \} \},\n\s+findesPraecist: \{ id in AX\.allApps\(\)\.contains \{ \$0\.bundleIdentifier == id \} \}\) else \{\n\s+Out\.fail\("the app the gate judged is no longer running - nothing was done", code: "app-gone"\)\n\}\nlet args = Args\(oversatArgv\)/m.test(mainSwift)); const navneSammenligninger = kilder.flatMap(f => src[f].split('\n').map((l, i) => ({ f, n: i + 1, l }))) .filter(({ f, l }) => f !== 'Navne.swift' && /(localizedName|applicationName)\??\.lowercased\(\)/.test(l)); check('6d ingen anden sammenligning af programnavne end adgangskode-tjekket (kun et ekstra afslag)', @@ -157,6 +176,13 @@ check('6d ingen anden sammenligning af programnavne end adgangskode-tjekket (kun check('6e opstarten stopper ved et tvetydigt navn - baade opslaget og selve starten', /let o = appOpslag\(hvad\)\n\s+if let k = o\.app \{ return \(k\.bundleIdentifier, true\) \}\n\s+if o\.tvetydig \{ return \(nil, false\) \}/.test(ax) && /let opslag = appOpslag\(hvad\)\n\s+if opslag\.tvetydig \{/.test(ax)); +check('2d et program uden id faar sin proces som id (pid:)', JSON.stringify(sw.id) === '["pid:5","pid:6","dk.a"]', JSON.stringify(sw.id)); +check('6g alle filtre sammenligner gennem AX.passer, og opslaget kender pid:', + /static func passer\(_ a: NSRunningApplication, _ scope: String\) -> Bool \{\n\s+Navne\.id\(bundleId: a\.bundleIdentifier, pid: a\.processIdentifier\) == scope\n\s+\}/.test(ax) + && (ax.match(/return AX\.passer\(a, scope\)/g) || []).length === 3 && /if let scope = args\.str\("app"\), !AX\.passer\(a, scope\) \{ continue \}/.test(mainSwift) + && (src['Capture.swift'].match(/AX\.passer\(\$0, bid\)/g) || []).length === 3 + && /if hvad\.hasPrefix\("pid:"\) \{ return \(alle\.first \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) == hvad \}, false\) \}/.test(ax) + && /slaaOp: \{ AX\.app\(bundleId: \$0\)\.map \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) \} \}/.test(mainSwift)); check('6f leveringen (modtager) bruger kun opslaget', /guard let app = AX\.app\(bundleId: navn\) else \{/.test(mainSwift)); // 7-8 · gennem serverens rigtige opslag, med en attrap der svarer som Gustavs Mac @@ -171,6 +197,14 @@ const bid = await resolveBundleId('WhatsApp'); check('7 porten ser net.whatsapp.WhatsApp for app "WhatsApp"', bid === 'net.whatsapp.WhatsApp', String(bid)); const ra = await resolveApp('WhatsApp'); check('8 resolveApp ser samme program', ra?.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(ra)); +h.saetSvar({ apps: { apps: [ + { name: 'Other', bundleId: 'dk.same', pid: 100, active: true }, + { name: 'Wanted', bundleId: 'dk.same', pid: 101, active: false }, +] } }); +const p2 = await resolveApp('Wanted'); +check('8b «er det programmet mennesket bruger?» gaelder alle processer med id\'et (R17, Opus P2)', p2?.active === true, JSON.stringify(p2)); +const p2b = await resolveApp('=dk.same'); +check('8c et bundet id slaas op praecist og er aktivt, naar én proces med id\'et er', p2b?.bundleId === 'dk.same' && p2b?.active === true, JSON.stringify(p2b)); // 9-11 · den rigtige hjaelper const hjaelper = [join(ROOT, 'helper', '.build', 'release', 'cmcp-helper'), join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper')].find(p => existsSync(p)); From a6673b409c07e6fc6c6a7feace252eb4b01fc5d8 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 12:07:51 +0200 Subject: [PATCH 109/132] fix(port): R18 (Astra + Opus) - bindingen holder hele vejen, visningstjenester afvises, Touch ID-nej proevet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Begge: procesbinding (levering til netop den dømte proces) hører til 0.3. Astra (R18): - Bindingen holder gennem hele hjaelperen: AX.kunPraecistId saettes ved indgangen; appOpslag tager saa kun det praecise id, og opstarten falder hverken til navne eller disken, hvis programmet forsvinder efter indgangen. - Forhaandstjekkene faar den bundne form (appVaerdi: sendeportens samtale, vinduer), og det usloerede skaermbillede bindes ogsaa. - «pid:» ens i porten og hjaelperen og reserveret (et program der HEDDER «pid:5» naas aldrig ad den vej). CHANGELOG: handlinger i et program uden id er stadig «ukendt maal». - Touch ID-svaret gaar gennem touchIdUdfald (ren funktion, adfaerdsproevet), og callbacken er bundet omkring den - «let ok = true» kan ikke stå der. Opus (R18, maalt live): macOS' visningstjenester koerer én proces pr. vaertsprogram under SAMME id med hvert sit navn («Autoudfyld (Google Chrome)» / «Autoudfyld (Agent360 IDE)»); leveringen gaar til id'et. Et navn hvis id deles af en koerende proces med et ANDET navn er nu tvetydigt og afvises - i porten og i Navne. To vinduer med samme navn (Chrome x2) er ikke tvetydige; dem dækker «aktiv over hele id'et». Afslaget naevner den proces mennesket bruger. Proever: usynlige-navne 95, bundet-maal 7 (send-tjek bundet, visningstjeneste afvist), ikon-boks 38. 39/40 skaermsikre - skaerm-laan D3 er timing under load (groen 47/47 i foerste genkoersel ved load 12). Mutanter W1-W8, V1-V3 roede; Z1/Z3/Z6/U2/U9/U14/U21/Y3 opdateret til den nye kode. 192 ankre. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 158 ++++++++++++++++-- CHANGELOG.md | 9 +- .../Sources/cmcp-helper/Accessibility.swift | 11 +- helper/Sources/cmcp-helper/Navne.swift | 17 +- helper/Sources/cmcp-helper/main.swift | 3 +- helper/Sources/cmcp-status/Tekst.swift | 7 + helper/Sources/cmcp-status/main.swift | 7 +- mcp-server/helper.js | 25 ++- mcp-server/index.js | 15 +- test/bundet-maal.mjs | 50 +++++- test/ikon-boks.mjs | 12 +- test/usynlige-navne.mjs | 58 +++++-- 12 files changed, 315 insertions(+), 57 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 3e56f2d1..59a42070 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1496,8 +1496,8 @@ "fil": "mcp-server/helper.js", "par": [ [ - "return hits.length === 1 ? hits[0] : null;", - "return hits[0] || null;" + "return hits.length === 1 && !deltId(hits[0]) ? hits[0] : null;", + "return hits[0] && !deltId(hits[0]) ? hits[0] : null;" ] ], "proeve": "test/usynlige-navne.mjs", @@ -1580,7 +1580,7 @@ "fil": "helper/Sources/cmcp-helper/main.swift", "par": [ [ - "let args = Args(oversatArgv)", + "let args = Args(oversatArgv.argv)", "let args = Args(CommandLine.arguments)" ] ], @@ -1640,8 +1640,8 @@ "fil": "mcp-server/helper.js", "par": [ [ - "const hit = apps.find(a => (a.bundleId || '') === w)\n || ", - "const hit = " + "const viaId = apps.find(a => (a.bundleId || '') === w)\n || ", + "const viaId = " ] ], "proeve": "test/usynlige-navne.mjs", @@ -1724,7 +1724,7 @@ "fil": "helper/Sources/cmcp-helper/Accessibility.swift", "par": [ [ - " if o.tvetydig { return (nil, false) }\n", + " if o.tvetydig || kunPraecistId { return (nil, false) }\n", "" ] ], @@ -1928,8 +1928,8 @@ "fil": "helper/Sources/cmcp-status/main.swift", "par": [ [ - " } else {\n a.svar(ok: ok)\n }", - " } else {\n a.svar(ok: true)\n }" + "case .svar(let v):\n a.svar(ok: v)", + "case .svar(let v):\n _ = v; a.svar(ok: true)" ] ], "proeve": "test/ikon-boks.mjs", @@ -2000,8 +2000,8 @@ "fil": "mcp-server/index.js", "par": [ [ - " if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal;\n", - "" + " && (tool.tier !== TIER.READ || (name === 'computer_screenshot' && args.redact === false))) args[BUNDET] = koerendeMaal;", + " && false) args[BUNDET] = koerendeMaal;" ] ], "proeve": "test/bundet-maal.mjs", @@ -2024,8 +2024,8 @@ "fil": "mcp-server/index.js", "par": [ [ - " if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal;", - " if (args.app && targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = targetBundleId;" + " if (args.app && koerendeMaal && koerendeMaal === targetBundleId\n", + " if (args.app && targetBundleId && (koerendeMaal = targetBundleId)\n" ] ], "proeve": "test/bundet-maal.mjs", @@ -2060,7 +2060,7 @@ "fil": "mcp-server/helper.js", "par": [ [ - "const aktiv = !!hit?.active || (!!hit?.bundleId && (r.apps || []).some(a => a.bundleId === hit.bundleId && a.active));", + "const aktiv = !!hit?.active || !!aktivProces;", "const aktiv = !!hit?.active;" ] ], @@ -2186,5 +2186,137 @@ ], "proeve": "test/usynlige-navne.mjs", "forventet": "6g" + }, + { + "navn": "W1-hjaelperen-glemmer-bindingen", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + "AX.kunPraecistId = oversatArgv.bundet\n", + "" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6h" + }, + { + "navn": "W2-bundet-opslag-falder-til-navne", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + " if kunPraecistId { return (alle.first { $0.bundleIdentifier == hvad }, false) }\n", + "" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6h" + }, + { + "navn": "W3-bundet-opstart-falder-til-disken", + "fil": "helper/Sources/cmcp-helper/Accessibility.swift", + "par": [ + [ + "if o.tvetydig || kunPraecistId { return (nil, false) }", + "if o.tvetydig { return (nil, false) }" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "6h" + }, + { + "navn": "W4-sendeporten-ubundet", + "fil": "mcp-server/index.js", + "par": [ + [ + "callHelper(['samtale', '--app', appVaerdi(args, bid), '--title-only']", + "callHelper(['samtale', '--app', bid, '--title-only']" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "4" + }, + { + "navn": "W5-pid-ikke-reserveret", + "fil": "mcp-server/helper.js", + "par": [ + [ + " if (/^pid:\\d+$/.test(w)) return apps.find(a => !a.bundleId && String(a.pid) === w.slice(4)) || null;\n", + "" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1c.1" + }, + { + "navn": "W6-touch-id-nej-bliver-ja", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + "ok && erLaan ? .laan : .svar(ok)", + "ok && erLaan ? .laan : .svar(true)" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6d" + }, + { + "navn": "W7-ok-overskrevet-i-callbacken", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " self?.boks.touchIdIGang = false\n // Et mislykket", + " self?.boks.touchIdIGang = false\n let ok = true\n // Et mislykket" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5c2" + }, + { + "navn": "W8-skaermbillede-ubundet", + "fil": "mcp-server/index.js", + "par": [ + [ + " && (tool.tier !== TIER.READ || (name === 'computer_screenshot' && args.redact === false))) args[BUNDET] = koerendeMaal;", + " && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal;" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "5" + }, + { + "navn": "V1-serveren-ser-ikke-delt-id", + "fil": "mcp-server/helper.js", + "par": [ + [ + " if (viaNavn) return deltId(viaNavn) ? null : viaNavn;", + " if (viaNavn) return viaNavn;" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "6" + }, + { + "navn": "V2-hjaelperen-ser-ikke-delt-id", + "fil": "helper/Sources/cmcp-helper/Navne.swift", + "par": [ + [ + "return delt ? .tvetydig : v", + "return v" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "2a.7" + }, + { + "navn": "V3-delt-id-ogsaa-ved-samme-navn", + "fil": "mcp-server/helper.js", + "par": [ + [ + "a.bundleId === x.bundleId && smaa(a.name || '') !== smaa(x.name || '')", + "a.bundleId === x.bundleId" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1a.9" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 96a9b83a..04ed5e87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,8 +36,13 @@ question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-bo starting it in the background was refused as an unknown app, and so was every action in it. Names are now compared without invisible formatting characters, on the server and in the helper alike - an exact name still wins, and if more -than one app fits, none is chosen and the action is refused. -(`test/usynlige-navne.mjs`) +than one app fits, none is chosen and the action is refused. Once the gate has +judged a running app, everything after it is bound to that exact app: if it quits +in between, nothing happens. A name whose bundle id another running process +shares under a different name (macOS runs services such as AutoFill once per app, +under one id) is refused rather than guessed. An app without a bundle id is found by its process +for reading; acting in it is still treated as an unknown app. +(`test/usynlige-navne.mjs`, `test/bundet-maal.mjs`) **A step during a screen loan waits for you.** If you are using the keyboard or mouse, the step now waits up to five seconds for a pause instead of telling the agent to call again; if you keep going, it is refused and nothing moves. diff --git a/helper/Sources/cmcp-helper/Accessibility.swift b/helper/Sources/cmcp-helper/Accessibility.swift index 636629a8..5695d223 100644 --- a/helper/Sources/cmcp-helper/Accessibility.swift +++ b/helper/Sources/cmcp-helper/Accessibility.swift @@ -172,8 +172,13 @@ enum AX { /// Id'et eller navnet slaaet op efter Navne-reglen - samme regel som serverens port. /// `tvetydig`: flere passer kun uden usynlige tegn; saa vaelges intet, og opstarten /// falder heller ikke tilbage paa disken (R16, Astra). + /// Saat ved indgangen naar serverens port bandt maalet (`--app =`): kun det praecise id. + nonisolated(unsafe) static var kunPraecistId = false + static func appOpslag(_ hvad: String) -> (app: NSRunningApplication?, tvetydig: Bool) { let alle = allApps() + // Et bundet maal: kun det praecise id - aldrig navne, aldrig store/smaa (R18, Astra). + if kunPraecistId { return (alle.first { $0.bundleIdentifier == hvad }, false) } // Et program uden id, allerede oversat til sin proces: kun den proces. if hvad.hasPrefix("pid:") { return (alle.first { Navne.id(bundleId: $0.bundleIdentifier, pid: $0.processIdentifier) == hvad }, false) } switch Navne.vaelgApp(ids: alle.map { $0.bundleIdentifier }, navne: alle.map { $0.localizedName }, want: hvad) { @@ -1456,7 +1461,8 @@ extension AX { static func launchMaal(_ hvad: String) -> (bundleId: String?, koerer: Bool) { let o = appOpslag(hvad) if let k = o.app { return (k.bundleIdentifier, true) } - if o.tvetydig { return (nil, false) } + // Tvetydigt, eller et bundet maal der ikke koerer mere: aldrig disken (R18). + if o.tvetydig || kunPraecistId { return (nil, false) } guard let u = programURL(hvad) else { return (nil, false) } return (Bundle(url: u)?.bundleIdentifier, false) } @@ -1470,6 +1476,9 @@ extension AX { static func launchApp(_ hvad: String, stille: Bool = false) -> (ok: Bool, why: String, bundleId: String?) { // Samme opslag og samme raekkefoelge som launchMaal, saa porten vurderede det der startes. let opslag = appOpslag(hvad) + if kunPraecistId && opslag.app == nil { + return (false, "the app the gate judged is no longer running - nothing was started", nil) + } if opslag.tvetydig { return (false, "more than one running app is called '\(hvad)' once invisible characters are ignored - name it by bundle id", nil) } diff --git a/helper/Sources/cmcp-helper/Navne.swift b/helper/Sources/cmcp-helper/Navne.swift index db7137b1..3aff50a9 100644 --- a/helper/Sources/cmcp-helper/Navne.swift +++ b/helper/Sources/cmcp-helper/Navne.swift @@ -65,7 +65,13 @@ enum Navne { if let i = ids.firstIndex(where: { $0.map { Array($0.unicodeScalars) } == w }) { return .fundet(i) } let lw = smaa(w) if let i = ids.firstIndex(where: { $0.map { smaa(Array($0.unicodeScalars)) } == lw }) { return .fundet(i) } - return vaelg(navne.map { $0 ?? "" }, want) + let v = vaelg(navne.map { $0 ?? "" }, want) + // ⛔ R18 (Opus, MAALT live): et navn hvis id deles med en koerende proces med et ANDET + // navn (visningstjenester), er tvetydigt - leveringen gaar til id'et, ikke processen. + guard case .fundet(let i) = v, let id = ids[i], !id.isEmpty else { return v } + let mit = smaa(Array((navne[i] ?? "").unicodeScalars)) + let delt = ids.indices.contains { $0 != i && ids[$0] == id && smaa(Array((navne[$0] ?? "").unicodeScalars)) != mit } + return delt ? .tvetydig : v } /// Programmets id efter oversaettelsen. Et program uden bundle-id (fx et program @@ -80,17 +86,22 @@ enum Navne { /// opslaget blandt de koerende programmer; giver det intet, staar argumentet uroert. /// R17: `--app =` er et maal serverens port har bundet - kun det praecise id, og /// koerer det ikke (`findesPraecist`), er svaret nil: intet maa ske. + /// `bundet` siger at maalet var bundet: saa maa intet senere opslag i hjaelperen + /// falde tilbage paa navne eller paa disken (R18, Astra: programmet kan forsvinde + /// mellem indgangen og leveringen). static func oversaet(_ argv: [String], slaaOp: (String) -> String?, - findesPraecist: (String) -> Bool) -> [String]? { + findesPraecist: (String) -> Bool) -> (argv: [String], bundet: Bool)? { var a = argv + var bundet = false for i in a.indices.dropLast() where a[i] == "--app" && !a[i + 1].hasPrefix("--") { let v = a[i + 1] if v.hasPrefix("=") { let id = String(v.dropFirst()) guard !id.isEmpty, findesPraecist(id) else { return nil } a[i + 1] = id + bundet = true } else if let bid = slaaOp(v) { a[i + 1] = bid } } - return a + return (a, bundet) } } diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index e2270485..4d941976 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -34,7 +34,8 @@ guard let oversatArgv = Navne.oversaet(CommandLine.arguments, slaaOp: { AX.app(b findesPraecist: { id in AX.allApps().contains { $0.bundleIdentifier == id } }) else { Out.fail("the app the gate judged is no longer running - nothing was done", code: "app-gone") } -let args = Args(oversatArgv) +AX.kunPraecistId = oversatArgv.bundet +let args = Args(oversatArgv.argv) // ⛔ FUNDET AF SIKKERHEDSREVIEWET 20/9. `contains` og `title` gik som // ARGUMENTER, og `ps` viser hele kommandolinjen for enhver proces med samme diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index 61c62afd..3a3f7fc5 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -90,6 +90,13 @@ func boksKnapperAktive(sidenNytSpoergsmaal: TimeInterval, touchIdIGang: Bool) -> sidenNytSpoergsmaal >= BOKS_PAUSE && !touchIdIGang } +enum TouchIdUdfald: Equatable { case laan, svar(Bool) } + +/// Hvad Touch ID-svaret betyder - for menuen og boksen ens. Et nej er altid et nej; +/// kun et ja til et skaerm-laan bliver et laan (R18, Astra: et «ok = true» i callbacken +/// overlevede proeven). +func touchIdUdfald(ok: Bool, erLaan: Bool) -> TouchIdUdfald { ok && erLaan ? .laan : .svar(ok) } + enum BoksHandling: Equatable { case foelg, tillad(String), afvis(String), gjort(String), hentFrem(String), intet } /// Hvad et tryk paa en boksknap betyder. Knappen baerer sit eget spoergsmaal (`knapNonce`); diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index c8cdd2a1..38753c7c 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -947,7 +947,8 @@ final class Ikon: NSObject, NSMenuDelegate { bekraeftMenneske(a) { [weak self] ok in self?.boks.touchIdIGang = false // Et mislykket Touch ID er et nej, ikke et «proev igen» agenten kan vente paa. - if ok && a.s.kind == "screen" { + switch touchIdUdfald(ok: ok, erLaan: a.s.kind == "screen") { + case .laan: if let l = aktivtLaan, !l.lukket, l !== a { // Skaerm-koe (2/10): kaploeb - et andet laan blev givet mellem at // menuen blev aabnet og klikket (gatingen i menuNeedsUpdate missede @@ -964,8 +965,8 @@ final class Ikon: NSObject, NSMenuDelegate { DispatchQueue.main.asyncAfter(deadline: .now() + Double(minutter) * 60) { if aktivtLaan === a { a.afslutLaan() } } - } else { - a.svar(ok: ok) + case .svar(let v): + a.svar(ok: v) } anmodninger.removeAll { $0 === a } self?.tik() diff --git a/mcp-server/helper.js b/mcp-server/helper.js index f8051f41..ef715c4c 100644 --- a/mcp-server/helper.js +++ b/mcp-server/helper.js @@ -158,15 +158,24 @@ export function findProgram(apps, want) { // R17: et maal porten har bundet (`=`, se appArg i index.js) er PRAECIS det id - // ingen store/smaa, ingen navne. Er det vaek, er svaret intet. if (w.startsWith('=')) return (w.length > 1 && apps.find(a => (a.bundleId || '') === w.slice(1))) || null; + // Et program uden bundle-id hedder «pid:» efter oversaettelsen (Navne.id i hjaelperen). + // Formatet er reserveret: et program der HEDDER «pid:5», naas aldrig ad den vej (R18, Astra). + if (/^pid:\d+$/.test(w)) return apps.find(a => !a.bundleId && String(a.pid) === w.slice(4)) || null; const lw = smaa(w); - const hit = apps.find(a => (a.bundleId || '') === w) - || apps.find(a => a.bundleId && smaa(a.bundleId) === lw) - || apps.find(a => smaa(a.name || '') === lw); - if (hit) return hit; + const viaId = apps.find(a => (a.bundleId || '') === w) + || apps.find(a => a.bundleId && smaa(a.bundleId) === lw); + if (viaId) return viaId; + // ⛔ R18 (Opus, MAALT live): macOS' visningstjenester koerer én proces pr. vaertsprogram med + // SAMME id og hvert sit navn («Autoudfyld (Google Chrome)» / «Autoudfyld (Agent360 IDE)»). + // Leveringen gaar til id'et, ikke til processen - saa et navn hvis id deles med en koerende + // proces med et ANDET navn, er tvetydigt og afvises. Samme navn (Chrome x2) er ikke tvetydigt. + const deltId = (x) => !!x.bundleId && apps.some(a => a !== x && a.bundleId === x.bundleId && smaa(a.name || '') !== smaa(x.name || '')); + const viaNavn = apps.find(a => smaa(a.name || '') === lw); + if (viaNavn) return deltId(viaNavn) ? null : viaNavn; const n = navneNoegle(want); if (!n) return null; const hits = apps.filter(a => navneNoegle(a.name) === n); - return hits.length === 1 ? hits[0] : null; + return hits.length === 1 && !deltId(hits[0]) ? hits[0] : null; } /// Oversaetter det program-argument agenten skrev, til et kanonisk bundle-ID. @@ -236,8 +245,10 @@ export async function resolveApp(appArg) { const hit = findProgram(r.apps || [], want); // R17 (Opus P2): «er det programmet mennesket bruger lige nu?» gaelder ALLE processer // med det valgte id - hjaelperen leverer til id'et, ikke til den ene proces. - const aktiv = !!hit?.active || (!!hit?.bundleId && (r.apps || []).some(a => a.bundleId === hit.bundleId && a.active)); - return hit ? { bundleId: hit.bundleId || null, active: aktiv, name: hit.name } : null; + const aktivProces = hit?.bundleId ? (r.apps || []).find(a => a.bundleId === hit.bundleId && a.active) : null; + const aktiv = !!hit?.active || !!aktivProces; + // Navnet i et afslag er den proces mennesket faktisk bruger. + return hit ? { bundleId: hit.bundleId || null, active: aktiv, name: (aktivProces || hit).name } : null; } catch { return null; } diff --git a/mcp-server/index.js b/mcp-server/index.js index 00bd30ab..8f399b5e 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -562,7 +562,7 @@ async function sendeDom(name, args, bid) { let slags = beskedSlags(bid); if (!slags) return null; let s = null; - const laes = async () => s ??= await callHelper(['samtale', '--app', bid], { timeout: 15000 }).catch(() => ({})); + const laes = async () => s ??= await callHelper(['samtale', '--app', appVaerdi(args, bid)], { timeout: 15000 }).catch(() => ({})); // Den kontrol et tryk eller klik rammer - slaaet op ÉN gang. `fejl` = opslaget // mislykkedes; saa kan intet bindes, og en afsendelse afvises (runde 4, Astra 2). let kontrolSvar; @@ -587,7 +587,7 @@ async function sendeDom(name, args, bid) { // (Astra 2): et tryk kan ramme en knap i et ANDET vindue end det fokuserede, saa // baade det fokuserede vindues titel og kontrollens vindues titel doemmes. if (slags === 'browser') { - const t = await callHelper(['samtale', '--app', bid, '--title-only'], { timeout: 8000 }).catch(() => ({})); + const t = await callHelper(['samtale', '--app', appVaerdi(args, bid), '--title-only'], { timeout: 8000 }).catch(() => ({})); const k = await kontrol(); // Runde 5 (Astra 2, Fable 1): en kontrol hvis vindue ikke kan laeses, er et ukendt // vindue - det doemmes som den fokuserede titel doemmes: fejl-lukket, som en chat. @@ -804,6 +804,9 @@ async function optag(args) { /// vaelge enhver kopi der paastaar id'et (programURL, 24/9). const BUNDET = Symbol('bundet maal'); const appArg = (args) => (args[BUNDET] ? `=${args[BUNDET]}` : String(args.app)); +/// Et id serveren selv har i haanden (fx porten maal), i den bundne form naar kaldet er bundet +/// til netop det id (R18, Astra: sendeportens og vinduernes opslag fik det ubundne id). +const appVaerdi = (args, bid) => (args[BUNDET] && args[BUNDET] === bid ? `=${bid}` : bid); async function runTool(name, args) { switch (name) { @@ -1148,7 +1151,7 @@ async function runTool(name, args) { if (!bid) return errorResult(`Refused: '${args.app}' is not running, so there is no field to type in. Use computer_apps for the exact name.`); let titel = null; try { - const w = await callHelper(['windows', '--app', bid], { timeout: 8000 }); + const w = await callHelper(['windows', '--app', appVaerdi(args, bid)], { timeout: 8000 }); titel = ((w && w.windows) || [])[0]?.title || null; } catch { titel = null; } // SERVEREN skriver hvor, ikke modellen. @@ -1179,7 +1182,7 @@ async function runTool(name, args) { let hvor = null; try { const bid = await frontmostBundleId(); - const w = bid ? await callHelper(['windows', '--app', String(bid)], { timeout: 8000 }) : null; + const w = bid ? await callHelper(['windows', '--app', appVaerdi(args, String(bid))], { timeout: 8000 }) : null; const titel = ((w && w.windows) || [])[0]?.title; hvor = bid ? (titel ? `${bid} - the window "${String(titel).slice(0, 70)}"` : bid) : null; } catch { hvor = null; } @@ -1470,7 +1473,9 @@ async function haandterKald(request) { } // R17: fra her rammer alt det koerende program porten vurderede - se appArg. - if (args.app && koerendeMaal && koerendeMaal === targetBundleId && tool.tier !== TIER.READ) args[BUNDET] = koerendeMaal; + // Ogsaa et usloeret skaermbillede, som porten vurderer som en skrivning (R18, Astra). + if (args.app && koerendeMaal && koerendeMaal === targetBundleId + && (tool.tier !== TIER.READ || (name === 'computer_screenshot' && args.redact === false))) args[BUNDET] = koerendeMaal; // `computer_ask_user` viser selv en dialog til mennesket - den ER // samtykke-oejeblikket. Spurgte porten foerst, ville mennesket faa to diff --git a/test/bundet-maal.mjs b/test/bundet-maal.mjs index a234d318..9d3e2953 100644 --- a/test/bundet-maal.mjs +++ b/test/bundet-maal.mjs @@ -81,20 +81,58 @@ const appArgv = (k) => { const i = k.argv.indexOf('--app'); return i >= 0 ? k.ar srv.kill(); } -// 3 · to processer med samme id - den aktive er menneskets (Opus P2). Den aktive staar -// SIDST, saa et opslag der kun ser paa den foerste proces med id'et, ville sige ja. +// 3 · to vinduer af samme program (samme id, samme navn) - mennesket bruger det ene (Opus P2). +// Den aktive staar SIDST, saa et opslag der kun ser paa den foerste proces, ville sige ja. { const { srv, rpc, kald, hj } = klient({ apps: { apps: [ - { name: 'Wanted', bundleId: 'dk.same', pid: 101, active: false }, - { name: 'Other', bundleId: 'dk.same', pid: 100, active: true }, + { name: 'Browser', bundleId: 'dk.same', pid: 101, active: false }, + { name: 'Browser', bundleId: 'dk.same', pid: 100, active: true }, ] } }); await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); - const r = await kald('computer_key', { app: 'Wanted', combo: 'cmd+b' }); + const r = await kald('computer_key', { app: 'Browser', combo: 'cmd+b' }); const tast = hj.kald().filter(k => k.argv[0] === 'key'); - check('3 en anden proces med samme id er den mennesket bruger: afvist, intet tastet', r.fejl && tast.length === 0, + check('3 en anden proces med samme id er den mennesket bruger: afvist, intet tastet', r.fejl && tast.length === 0 && /Browser is the window/.test(r.tekst), JSON.stringify(tast.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 160)); srv.kill(); } +// 4 · sendeportens eget opslag faar ogsaa det bundne maal (R18, Astra: «samtale --app com.google.Chrome») +{ + const { srv, rpc, kald, hj } = klient({ + apps: { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: true }, + { name: 'Google Chrome', bundleId: 'com.google.Chrome', pid: 3304, active: false }] }, + samtale: { window: 'New Tab - Google Chrome' }, + }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + await kald('computer_type', { app: 'Google Chrome', text: 'hej' }); + const samtaler = hj.kald().filter(k => k.argv[0] === 'samtale'); + check('4 sendeportens samtale-opslag faar det bundne id, ligesom leveringen', samtaler.length >= 1 && samtaler.every(k => appArgv(k) === '=com.google.Chrome'), + JSON.stringify(samtaler.map(k => k.argv))); + srv.kill(); +} + +// 6 · visningstjenester: samme id, hvert sit navn (R18, Opus - maalt live paa Gustavs Mac) +{ + const { srv, rpc, kald, hj } = klient({ apps: { apps: [ + { name: 'Autoudfyld (Agent360 IDE)', bundleId: 'com.apple.SafariPlatformSupport.Helper', pid: 3798, active: false }, + { name: 'Autoudfyld (Google Chrome)', bundleId: 'com.apple.SafariPlatformSupport.Helper', pid: 65766, active: false }, + { name: 'Google Chrome', bundleId: 'com.google.Chrome', pid: 65569, active: true }, + ] } }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + const r = await kald('computer_key', { app: 'Autoudfyld (Google Chrome)', combo: 'cmd+b' }); + const tast = hj.kald().filter(k => k.argv[0] === 'key'); + check('6 en visningstjeneste hvis id deles af en anden: afvist, intet leveret til den forkerte proces', r.fejl && tast.length === 0, + JSON.stringify(tast.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 120)); + srv.kill(); +} + +// 5 · bindingen dækker ogsaa et usloeret skaermbillede, som porten vurderer som en skrivning (R18, Astra) +{ + const { readFileSync } = await import('node:fs'); + const ix = readFileSync(join(ROOT, 'mcp-server', 'index.js'), 'utf8'); + check('5 bindingen: kun et koerende maal fra porten - skrivninger og det usloerede skaermbillede', + /if \(args\.app && koerendeMaal && koerendeMaal === targetBundleId\n\s+&& \(tool\.tier !== TIER\.READ \|\| \(name === 'computer_screenshot' && args\.redact === false\)\)\) args\[BUNDET\] = koerendeMaal;/.test(ix)); +} + console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 97baf795..48c70c51 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -27,11 +27,12 @@ struct Ag: Decodable { let navn: String; let maal: String?; let nu: String } struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; let fakta: [String]; let menuKnapper: [String] } struct Hd: Decodable { let knap: String; let knapNonce: String?; let visteNonce: String?; let aktive: Bool } struct Ak: Decodable { let siden: Double; let iGang: Bool } +struct Ti: Decodable { let ok: Bool; let laan: Bool } struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V? } struct R: Decodable { let x: Double; let y: Double; let w: Double; let h: Double } struct S: Decodable { let vindue: R?; let mus: [Double]; let skaerme: [R] } struct H: Decodable { let synlig: R; let bredde: Double } -struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R]; let hjoerne: [H]; let handling: [Hd]; let aktive: [Ak] } +struct Ind: Decodable { let indhold: [I]; let skaerm: [S]; let cocoa: [R]; let hjoerne: [H]; let handling: [Hd]; let aktive: [Ak]; let touchId: [Ti] } let raa = FileHandle.standardInput.readDataToEndOfFile() let ind = try! JSONDecoder().decode(Ind.self, from: raa) // CGWindowList-lister som macOS giver dem: NSNumber og NSDictionary (via JSONSerialization). @@ -56,6 +57,7 @@ let ud: [String: Any] = [ case .gjort(let n): return "gjort:" + n; case .hentFrem(let n): return "hentFrem:" + n; case .intet: return "intet" } }, "aktive": ind.aktive.map { boksKnapperAktive(sidenNytSpoergsmaal: $0.siden, touchIdIGang: $0.iGang) }, "pause": BOKS_PAUSE, + "touchId": ind.touchId.map { t -> String in switch touchIdUdfald(ok: t.ok, erLaan: t.laan) { case .laan: return "laan"; case .svar(let v): return v ? "ja" : "nej" } }, "max": BOKS_MAX_TEGN] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); @@ -97,6 +99,7 @@ const ind = { { knap: 'Allow (Touch ID)', knapNonce: null, visteNonce: null, aktive: true }, { knap: 'Allow… (confirm with Touch ID)', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, ], + touchId: [{ ok: false, laan: false }, { ok: false, laan: true }, { ok: true, laan: false }, { ok: true, laan: true }], aktive: [{ siden: 0.5, iGang: false }, { siden: 1.0, iGang: false }, { siden: 5, iGang: true }, { siden: 5, iGang: false }], hjoerne: [{ synlig: { x: 0, y: 0, w: 1710, h: 1077 }, bredde: 360 }, { synlig: { x: 1710, y: -200, w: 3440, h: 1415 }, bredde: 360 }], vinduer: (() => { @@ -140,6 +143,8 @@ check('6a knapperne: Allow -> Touch ID-vejen paa KNAPPENS spoergsmaal; Deny og JSON.stringify(s.handling.slice(0, 7)) === JSON.stringify(['tillad:n1', 'intet', 'intet', 'afvis:n1', 'afvis:n1', 'gjort:n1', 'hentFrem:n1']), JSON.stringify(s.handling)); check('6b Follow virker altid; uden spoergsmaal eller med en ukendt knap sker intet', JSON.stringify(s.handling.slice(7)) === JSON.stringify(['foelg', 'intet', 'intet']), JSON.stringify(s.handling.slice(7))); +check('6d Touch ID: et nej er et nej - ogsaa for et skaerm-laan; kun et ja til et laan bliver et laan', + JSON.stringify(s.touchId) === '["nej","nej","ja","laan"]', JSON.stringify(s.touchId)); check(`6c knapperne venter ${s.pause} s efter et nyt spoergsmaal og er fra mens Touch ID er oppe`, JSON.stringify(s.aktive) === '[false,true,false,true]', JSON.stringify(s.aktive)); @@ -168,8 +173,9 @@ const tillad = krop('func tilladNonce('); check('5c et ja kraever Touch ID: intet svar foer bekraeftMenneske, og et ja i boksen kun naar HELE teksten stod der', /if kilde == "allow-box" && renTekst\(a\.s\.text\)\.count > BOKS_MAX_TEGN \{ return \}\n\s+boks\.touchIdIGang = true\n\s+bekraeftMenneske\(a\) \{/.test(tillad) && !/svar\(ok: true|svarLaan/.test(tillad.slice(0, tillad.indexOf('bekraeftMenneske(a)'))), tillad.slice(0, 300)); -check('5c2 svaret er Touch ID-svaret: et nej er et nej (aldrig svar(ok: true))', - /\} else \{\n\s+a\.svar\(ok: ok\)\n/.test(tillad) && !/svar\(ok: true/.test(tillad)); +check('5c2 svaret er Touch ID-svaret, gennem touchIdUdfald og intet andet (R18, Astra)', + /bekraeftMenneske\(a\) \{ \[weak self\] ok in\n\s+self\?\.boks\.touchIdIGang = false\n\s+\/\/[^\n]*\n\s+switch touchIdUdfald\(ok: ok, erLaan: a\.s\.kind == "screen"\) \{\n\s+case \.laan:/.test(tillad) + && /case \.svar\(let v\):\n\s+a\.svar\(ok: v\)\n/.test(tillad) && !/svar\(ok: true/.test(tillad)); check('5c3 et spoergsmaal findes kun paa sit eget engangsnummer', /func aaben\(_ nonce: String\?\) -> Anmodning\? \{\n\s+guard let n = nonce else \{ return nil \}\n\s+return anmodninger\.first \{ \$0\.s\.nonce == n && !\$0\.besvaret \}\n\s+\}/.test(m)); check('5d boksens tryk afgoeres af boksHandling med den viste nonce og om knapperne er aktive', /switch boksHandling\(knap: knap, knapNonce: n, visteNonce: boks\.nonce, aktive: boks\.knapperAktive\(\)\) \{/.test(knapKrop)); diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index 9a5679af..2cd42292 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -48,6 +48,8 @@ const NAVNE = [ [[' Notes'], 'Notes', 0, 'mellemrum foran navnet: passer uden usynlige tegn og kanter'], [['Notes'], ' ', null, 'kun mellemrum finder intet'], ]; +const VIS = { ids: ['com.apple.SafariPlatformSupport.Helper', 'com.apple.SafariPlatformSupport.Helper', 'com.google.Chrome', 'com.google.Chrome'], + navne: ['Autoudfyld (Agent360 IDE)', 'Autoudfyld (Google Chrome)', 'Google Chrome', 'Google Chrome'] }; // A2 · koerende programmer med id: [ids, navne, ønske, forventet, hvad] const APPS = [ [['dk.SAFE', 'com.apple.Passwords'], ['Harmless', 'dk.safe'], 'dk.safe', 0, 'bundle-id uden hensyn til store/smaa bogstaver foer navne (Astra R16)'], @@ -56,20 +58,32 @@ const APPS = [ [['net.whatsapp.WhatsApp', 'com.apple.finder'], [`${LRM}WhatsApp`, 'Finder'], 'WhatsApp', 0, 'Gustavs Mac'], [['dk.a'], ['A'], ` dk.a${BOM}`, 0, 'id med kanter'], [['dk.a', 'dk.b'], [`${LRM}X`, `X${RLM}`], 'X', null, 'tvetydigt navn'], + // R18 (Opus, maalt live 9/10): visningstjenester - samme id, hvert sit navn. Leveringen gaar til + // id'et, ikke processen, saa navnet er tvetydigt. To Chrome-vinduer med SAMME navn er ikke. + [VIS.ids, VIS.navne, 'Autoudfyld (Google Chrome)', null, 'en visningstjeneste: id delt med et andet navn - afvist'], + [VIS.ids, VIS.navne, 'Autoudfyld (Agent360 IDE)', null, 'ogsaa den anden visningstjeneste'], + [VIS.ids, VIS.navne, 'Google Chrome', 2, 'to processer med samme id OG samme navn: den foerste, som foer'], + [VIS.ids, VIS.navne, 'com.apple.SafariPlatformSupport.Helper', 0, 'id\'et selv: den foerste proces med id\'et, som foer'], ]; // A3 · oversaettelsen ved hjaelperens indgang: [argv, opslag, forventet argv, hvad] const OVERSAET = [ - [['h', 'find', '--app', 'WhatsApp', '--role', 'AXButton'], { WhatsApp: 'net.whatsapp.WhatsApp' }, [], ['h', 'find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton'], 'navnet bliver til id'], - [['h', 'find', '--app', '--role', 'AXButton'], { '--role': 'x' }, [], ['h', 'find', '--app', '--role', 'AXButton'], '--app uden vaerdi roeres ikke'], - [['h', 'find', '--app', 'Ukendt'], {}, [], ['h', 'find', '--app', 'Ukendt'], 'intet opslag: uroert'], - [['h', 'windows', '--app'], { '': 'x' }, [], ['h', 'windows', '--app'], '--app sidst roeres ikke'], + [['h', 'find', '--app', 'WhatsApp', '--role', 'AXButton'], { WhatsApp: 'net.whatsapp.WhatsApp' }, [], { argv: ['h', 'find', '--app', 'net.whatsapp.WhatsApp', '--role', 'AXButton'], bundet: false }, 'navnet bliver til id'], + [['h', 'find', '--app', '--role', 'AXButton'], { '--role': 'x' }, [], { argv: ['h', 'find', '--app', '--role', 'AXButton'], bundet: false }, '--app uden vaerdi roeres ikke'], + [['h', 'find', '--app', 'Ukendt'], {}, [], { argv: ['h', 'find', '--app', 'Ukendt'], bundet: false }, 'intet opslag: uroert'], + [['h', 'windows', '--app'], { '': 'x' }, [], { argv: ['h', 'windows', '--app'], bundet: false }, '--app sidst roeres ikke'], // R17: et maal porten har bundet (`=`) - kun det praecise id, ellers intet - [['h', 'type', '--app', '=net.whatsapp.WhatsApp'], {}, ['net.whatsapp.WhatsApp'], ['h', 'type', '--app', 'net.whatsapp.WhatsApp'], 'bundet id der koerer: det praecise id'], + [['h', 'type', '--app', '=net.whatsapp.WhatsApp'], {}, ['net.whatsapp.WhatsApp'], { argv: ['h', 'type', '--app', 'net.whatsapp.WhatsApp'], bundet: true }, 'bundet id der koerer: det praecise id, og resten af hjaelperen ved at det er bundet'], [['h', 'type', '--app', '=net.whatsapp.WhatsApp'], { '=net.whatsapp.WhatsApp': 'dk.andet', 'net.whatsapp.WhatsApp': 'dk.andet' }, [], null, 'bundet id der ikke koerer: intet - aldrig et navneopslag'], [['h', 'type', '--app', '=NET.whatsapp.WhatsApp'], {}, ['net.whatsapp.WhatsApp'], null, 'bundet id med andre store/smaa: intet'], [['h', 'type', '--app', '='], {}, [''], null, 'tomt bundet id: intet'], ]; // R17 · serverens side af det bundne maal: [apps (id, navn), oenske, forventet indeks] +// R18 · «pid:» er reserveret til programmer uden id - ens i porten og hjaelperen +const PIDS = [ + [[{ bundleId: '', name: 'Probe', pid: 5 }], 'pid:5', 0, 'et program uden id findes paa sin proces'], + [[{ bundleId: 'dk.x', name: 'pid:5', pid: 9 }], 'pid:5', null, 'et program der HEDDER «pid:5» naas ikke ad den vej'], + [[{ bundleId: 'dk.x', name: 'X', pid: 5 }], 'pid:5', null, 'et program MED id naas ikke paa sin proces'], +]; const BUNDNE = [ [[['dk.a', 'X'], ['dk.b', 'Y']], '=dk.b', 1, 'det praecise id'], [[['DK.A', 'X']], '=dk.a', null, 'andre store/smaa: intet'], @@ -117,7 +131,9 @@ let ud: [String: Any] = [ "navne": ind.navne.map { tal(Navne.vaelg($0.navne, $0.want)) }, "tvetydig": ind.navne.map { Navne.vaelg($0.navne, $0.want) == .tvetydig }, "apps": ind.apps.map { tal(Navne.vaelgApp(ids: $0.ids, navne: $0.navne, want: $0.want)) }, - "oversaet": ind.oversaet.map { o -> Any in Navne.oversaet(o.argv, slaaOp: { o.opslag[$0] }, findesPraecist: { o.findes.contains($0) }) ?? NSNull() }, + "oversaet": ind.oversaet.map { o -> Any in + guard let r = Navne.oversaet(o.argv, slaaOp: { o.opslag[$0] }, findesPraecist: { o.findes.contains($0) }) else { return NSNull() } + return ["argv": r.argv, "bundet": r.bundet] }, "id": [Navne.id(bundleId: nil, pid: 5), Navne.id(bundleId: "", pid: 6), Navne.id(bundleId: "dk.a", pid: 7)], "trim": trim, "cf": cf, "smaa": smaa] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) @@ -138,6 +154,10 @@ APPS.forEach(([, , , forventet, hvad], i) => { check(`1a.${i + 1} serveren (id+navn): ${hvad}`, jsApps[i] === forventet, `fik ${jsApps[i]}, ventede ${forventet}`); check(`2a.${i + 1} hjaelperen (id+navn): ${hvad}`, sw.apps[i] === forventet, `fik ${sw.apps[i]}, ventede ${forventet}`); }); +PIDS.forEach(([apps, want, forventet, hvad], i) => { + const hit = findProgram(apps, want); + check(`1c.${i + 1} serveren, pid: ${hvad}`, (hit ? apps.indexOf(hit) : null) === forventet, JSON.stringify(hit)); +}); BUNDNE.forEach(([apps, want, forventet, hvad], i) => { const liste = apps.map(([bundleId, name]) => ({ bundleId, name })); const hit = findProgram(liste, want); @@ -145,7 +165,8 @@ BUNDNE.forEach(([apps, want, forventet, hvad], i) => { }); check('2b et tvetydigt navn er sit eget svar i hjaelperen (ingen faldbag til disken)', sw.tvetydig[1] === true && sw.tvetydig[0] === false); OVERSAET.forEach(([, , , forventet, hvad], i) => - check(`2c.${i + 1} oversaettelsen ved indgangen: ${hvad}`, JSON.stringify(sw.oversaet[i]) === JSON.stringify(forventet), JSON.stringify(sw.oversaet[i]))); + check(`2c.${i + 1} oversaettelsen ved indgangen: ${hvad}`, + JSON.stringify(sw.oversaet[i] && { argv: sw.oversaet[i].argv, bundet: sw.oversaet[i].bundet }) === JSON.stringify(forventet), JSON.stringify(sw.oversaet[i]))); const forskel = (a, b) => { const s = new Set(b.map(String)); const t = new Set(a.map(String)); return [...a.filter(x => !s.has(String(x))), ...b.filter(x => !t.has(String(x)))].slice(0, 6); }; check(`3a trim: samme ${jsTrim.length} tegn i JS og Swift`, jsTrim.length === sw.trim.length && forskel(jsTrim, sw.trim).length === 0, JSON.stringify(forskel(jsTrim, sw.trim))); @@ -162,11 +183,16 @@ const src = Object.fromEntries(kilder.map(f => [f, readFileSync(join(KILDE, f), const ax = src['Accessibility.swift'], mainSwift = src['main.swift']; check('6a AX.app er opslaget og intet andet', /static func app\(bundleId: String\) -> NSRunningApplication\? \{ appOpslag\(bundleId\)\.app \}/.test(ax)); check('6a2 opslaget vaelger med Navne.vaelgApp og returnerer netop det valgte - intet foer det (R17, Astra A17)', - /static func appOpslag\(_ hvad: String\) -> \(app: NSRunningApplication\?, tvetydig: Bool\) \{\n\s+let alle = allApps\(\)\n\s+\/\/[^\n]*\n\s+if hvad\.hasPrefix\("pid:"\) \{ return \(alle\.first \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) == hvad \}, false\) \}\n\s+switch Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); + /static func appOpslag\(_ hvad: String\) -> \(app: NSRunningApplication\?, tvetydig: Bool\) \{\n\s+let alle = allApps\(\)\n\s+\/\/[^\n]*\n\s+if kunPraecistId \{ return \(alle\.first \{ \$0\.bundleIdentifier == hvad \}, false\) \}\n\s+\/\/[^\n]*\n\s+if hvad\.hasPrefix\("pid:"\) \{ return \(alle\.first \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) == hvad \}, false\) \}\n\s+switch Navne\.vaelgApp\(ids: alle\.map \{ \$0\.bundleIdentifier \}, navne: alle\.map \{ \$0\.localizedName \}, want: hvad\) \{\n\s+case \.fundet\(let i\): return \(alle\[i\], false\)\n\s+case \.tvetydig: return \(nil, true\)\n\s+case \.intet: return \(nil, false\)/.test(ax)); check('6b programmer paa disken: praecist filnavn, ellers Navne.vaelg over HELE listen og netop det valgte (R17, Astra A18)', /if FileManager\.default\.fileExists\(atPath: k\.path\) \{ return k \}\n\s+\}\n(\s+\/\/[^\n]*\n)*\s+var fund: \[URL\] = \[\]\n\s+for m in mapper \{\n\s+for f in \(try\? FileManager\.default\.contentsOfDirectory\(atPath: m\)\) \?\? \[\] where f\.hasSuffix\("\.app"\) \{\n\s+fund\.append\(URL\(fileURLWithPath: m\)\.appendingPathComponent\(f\)\)\n\s+\}\n\s+\}\n\s+/.test(ax) && /guard case \.fundet\(let i\) = Navne\.vaelg\(fund\.map \{ \$0\.deletingPathExtension\(\)\.lastPathComponent \}, hvad\) else \{ return nil \}\n\s+return fund\[i\]/.test(ax)); +check('6h et bundet maal holder hele vejen gennem hjaelperen: kun praecist id, ingen disk (R18, Astra)', + /^AX\.kunPraecistId = oversatArgv\.bundet\nlet args = Args\(oversatArgv\.argv\)/m.test(mainSwift) + && /if kunPraecistId \{ return \(alle\.first \{ \$0\.bundleIdentifier == hvad \}, false\) \}/.test(ax) + && /if o\.tvetydig \|\| kunPraecistId \{ return \(nil, false\) \}/.test(ax) + && /let opslag = appOpslag\(hvad\)\n\s+if kunPraecistId && opslag\.app == nil \{\n\s+return \(false,/.test(ax)); check('6c --app oversaettes ét sted, foer alle kommandoer, og et bundet maal der er vaek er en fejl', - /^guard let oversatArgv = Navne\.oversaet\(CommandLine\.arguments, slaaOp: \{ AX\.app\(bundleId: \$0\)\.map \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) \} \},\n\s+findesPraecist: \{ id in AX\.allApps\(\)\.contains \{ \$0\.bundleIdentifier == id \} \}\) else \{\n\s+Out\.fail\("the app the gate judged is no longer running - nothing was done", code: "app-gone"\)\n\}\nlet args = Args\(oversatArgv\)/m.test(mainSwift)); + /^guard let oversatArgv = Navne\.oversaet\(CommandLine\.arguments, slaaOp: \{ AX\.app\(bundleId: \$0\)\.map \{ Navne\.id\(bundleId: \$0\.bundleIdentifier, pid: \$0\.processIdentifier\) \} \},\n\s+findesPraecist: \{ id in AX\.allApps\(\)\.contains \{ \$0\.bundleIdentifier == id \} \}\) else \{\n\s+Out\.fail\("the app the gate judged is no longer running - nothing was done", code: "app-gone"\)\n\}\nAX\.kunPraecistId = oversatArgv\.bundet\nlet args = Args\(oversatArgv\.argv\)/m.test(mainSwift)); const navneSammenligninger = kilder.flatMap(f => src[f].split('\n').map((l, i) => ({ f, n: i + 1, l }))) .filter(({ f, l }) => f !== 'Navne.swift' && /(localizedName|applicationName)\??\.lowercased\(\)/.test(l)); check('6d ingen anden sammenligning af programnavne end adgangskode-tjekket (kun et ekstra afslag)', @@ -174,8 +200,8 @@ check('6d ingen anden sammenligning af programnavne end adgangskode-tjekket (kun && /let navngivet = content\.applications\.filter \{\n\s+\$0\.bundleIdentifier == bid \|\| \$0\.applicationName\.lowercased\(\) == bid\.lowercased\(\)\n\s+\}\n\s+let axNavngivet/.test(src['Capture.swift']), navneSammenligninger.map(x => `${x.f}:${x.n}`).join(', ')); check('6e opstarten stopper ved et tvetydigt navn - baade opslaget og selve starten', - /let o = appOpslag\(hvad\)\n\s+if let k = o\.app \{ return \(k\.bundleIdentifier, true\) \}\n\s+if o\.tvetydig \{ return \(nil, false\) \}/.test(ax) - && /let opslag = appOpslag\(hvad\)\n\s+if opslag\.tvetydig \{/.test(ax)); + /let o = appOpslag\(hvad\)\n\s+if let k = o\.app \{ return \(k\.bundleIdentifier, true\) \}\n\s+\/\/[^\n]*\n\s+if o\.tvetydig \|\| kunPraecistId \{ return \(nil, false\) \}/.test(ax) + && /let opslag = appOpslag\(hvad\)\n\s+if kunPraecistId && opslag\.app == nil \{[\s\S]{0,160}\n\s+if opslag\.tvetydig \{/.test(ax)); check('2d et program uden id faar sin proces som id (pid:)', JSON.stringify(sw.id) === '["pid:5","pid:6","dk.a"]', JSON.stringify(sw.id)); check('6g alle filtre sammenligner gennem AX.passer, og opslaget kender pid:', /static func passer\(_ a: NSRunningApplication, _ scope: String\) -> Bool \{\n\s+Navne\.id\(bundleId: a\.bundleIdentifier, pid: a\.processIdentifier\) == scope\n\s+\}/.test(ax) @@ -197,12 +223,18 @@ const bid = await resolveBundleId('WhatsApp'); check('7 porten ser net.whatsapp.WhatsApp for app "WhatsApp"', bid === 'net.whatsapp.WhatsApp', String(bid)); const ra = await resolveApp('WhatsApp'); check('8 resolveApp ser samme program', ra?.bundleId === 'net.whatsapp.WhatsApp', JSON.stringify(ra)); +h.saetSvar({ apps: { apps: [ + { name: 'Browser', bundleId: 'dk.same', pid: 101, active: false }, + { name: 'Browser', bundleId: 'dk.same', pid: 100, active: true }, +] } }); +const p2 = await resolveApp('Browser'); +check('8b «er det programmet mennesket bruger?» gaelder alle processer med id\'et - to vinduer, den aktive SIDST (R17, Opus P2)', p2?.active === true, JSON.stringify(p2)); h.saetSvar({ apps: { apps: [ { name: 'Other', bundleId: 'dk.same', pid: 100, active: true }, { name: 'Wanted', bundleId: 'dk.same', pid: 101, active: false }, ] } }); -const p2 = await resolveApp('Wanted'); -check('8b «er det programmet mennesket bruger?» gaelder alle processer med id\'et (R17, Opus P2)', p2?.active === true, JSON.stringify(p2)); +const p2c = await resolveApp('Wanted'); +check('8d samme id, ANDET navn: navnet er tvetydigt og afvises (R18, Opus)', p2c === null, JSON.stringify(p2c)); const p2b = await resolveApp('=dk.same'); check('8c et bundet id slaas op praecist og er aktivt, naar én proces med id\'et er', p2b?.bundleId === 'dk.same' && p2b?.active === true, JSON.stringify(p2b)); From c563570ec47f2f6c884b86dcbb5ed5eb5efbf991 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 12:22:27 +0200 Subject: [PATCH 110/132] test(navne): sammenlign tegn-reglerne for de tegn BEGGE runtimes kender CI 9/10 paa a6673b4 (som Opus forudsagde i R17): GitHubs Mac har Node med Unicode 17 og en Swift-runtime med aeldre tabeller - 28 nye tegn (fx U+A7CE) fik smaa bogstaver i JS men ikke i Swift, og 3c blev roed. Reglen er den samme; runtimes kender forskellige tegn. 3b/3c sammenligner nu de tegn begge kender (Swift: properties.age, JS: ikke \p{Cn}) og naevner versionerne; 3d siger hvor mange der er udeladt (<= 200). Konsekvensen er en kendt graense for ubundne laeseveje; skrivninger er bundet til det praecise id (bundet-maal.mjs). Co-Authored-By: Claude Opus 5.5 --- test/usynlige-navne.mjs | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index 2cd42292..e0a7a6eb 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -117,15 +117,17 @@ writeFileSync(join(ARB, 'main.swift'), `import Foundation struct N: Decodable { let navne: [String]; let want: String } struct A: Decodable { let ids: [String?]; let navne: [String?]; let want: String } struct O: Decodable { let argv: [String]; let opslag: [String: String]; let findes: [String] } -struct Ind: Decodable { let navne: [N]; let apps: [A]; let oversaet: [O] } +struct Ind: Decodable { let navne: [N]; let apps: [A]; let oversaet: [O]; let jsKoder: [Int] } let ind = try! JSONDecoder().decode(Ind.self, from: FileHandle.standardInput.readDataToEndOfFile()) func tal(_ v: Navne.Valg) -> Any { if case .fundet(let i) = v { return i }; return NSNull() } var trim: [Int] = [], cf: [Int] = [], smaa: [String] = [] +var maxAlder = (0, 0) for cp in 0...0x10FFFF where cp < 0xD800 || cp > 0xDFFF { let s = Unicode.Scalar(UInt32(cp))! if Navne.kant.contains(UInt32(cp)) { trim.append(cp) } if s.properties.generalCategory == .format { cf.append(cp) } let l = Navne.smaa([s]); if l != [s] { smaa.append(String(cp, radix: 16) + ":" + l.map { String($0.value, radix: 16) }.joined(separator: ",")) } + if let a = s.properties.age, (a.major, a.minor) > maxAlder { maxAlder = (a.major, a.minor) } } let ud: [String: Any] = [ "navne": ind.navne.map { tal(Navne.vaelg($0.navne, $0.want)) }, @@ -135,7 +137,10 @@ let ud: [String: Any] = [ guard let r = Navne.oversaet(o.argv, slaaOp: { o.opslag[$0] }, findesPraecist: { o.findes.contains($0) }) else { return NSNull() } return ["argv": r.argv, "bundet": r.bundet] }, "id": [Navne.id(bundleId: nil, pid: 5), Navne.id(bundleId: "", pid: 6), Navne.id(bundleId: "dk.a", pid: 7)], - "trim": trim, "cf": cf, "smaa": smaa] + "trim": trim, "cf": cf, "smaa": smaa, + // Tegn JS kender, men denne Swift-runtime ikke har i sine tabeller (Unicode-version, R17 Opus). + "ukendteAfJs": ind.jsKoder.filter { Unicode.Scalar(UInt32($0)).map { $0.properties.age == nil } ?? true }, + "unicode": String(maxAlder.0) + "." + String(maxAlder.1)] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); const BIN = join(ARB, 'navne'); @@ -144,6 +149,7 @@ const sw = JSON.parse(execFileSync(BIN, { encoding: 'utf8', maxBuffer: 64 << 20, navne: NAVNE.map(([navne, want]) => ({ navne, want })), apps: APPS.map(([ids, navne, want]) => ({ ids, navne, want })), oversaet: OVERSAET.map(([argv, opslag, findes]) => ({ argv, opslag, findes })), + jsKoder: [...jsCf, ...jsSmaa.map(e => parseInt(e.split(':')[0], 16))], }) })); NAVNE.forEach(([, , forventet, hvad], i) => { @@ -170,8 +176,21 @@ OVERSAET.forEach(([, , , forventet, hvad], i) => const forskel = (a, b) => { const s = new Set(b.map(String)); const t = new Set(a.map(String)); return [...a.filter(x => !s.has(String(x))), ...b.filter(x => !t.has(String(x)))].slice(0, 6); }; check(`3a trim: samme ${jsTrim.length} tegn i JS og Swift`, jsTrim.length === sw.trim.length && forskel(jsTrim, sw.trim).length === 0, JSON.stringify(forskel(jsTrim, sw.trim))); -check(`3b usynlige tegn (Cf): samme ${jsCf.length} tegn i JS og Swift`, forskel(jsCf, sw.cf).length === 0, JSON.stringify(forskel(jsCf, sw.cf))); -check(`3c smaa bogstaver: samme ${jsSmaa.length} tegn i JS og Swift`, forskel(jsSmaa, sw.smaa).length === 0, JSON.stringify(forskel(jsSmaa, sw.smaa))); +// ⛔ CI 9/10 (a6673b4, som Opus forudsagde i R17): GitHubs Mac har Node med Unicode 17 og en +// Swift-runtime med aeldre tabeller; 28 nye tegn (fx U+A7CE) faar smaa bogstaver i JS men ikke i +// Swift. Reglen er den samme - runtimes kender forskellige tegn. Sammenlign derfor de tegn BEGGE +// kender, og sig hvor mange der er udeladt. Konsekvensen er en KENDT GRAENSE for ubundne laeseveje; +// skrivninger er bundet til det praecise id (bundet-maal.mjs). +const swUkendt = new Set(sw.ukendteAfJs); +const kendtJs = (cp) => !/\p{Cn}/u.test(String.fromCodePoint(cp)); +const kp = (e) => typeof e === 'number' ? e : parseInt(String(e).split(':')[0], 16); +const begge = (e) => kendtJs(kp(e)) && !swUkendt.has(kp(e)); +const jsCfB = jsCf.filter(begge), swCfB = sw.cf.filter(begge), jsSmaaB = jsSmaa.filter(begge), swSmaaB = sw.smaa.filter(begge); +const udeladt = (jsCf.length - jsCfB.length) + (sw.cf.length - swCfB.length) + (jsSmaa.length - jsSmaaB.length) + (sw.smaa.length - swSmaaB.length); +const vers = `Node Unicode ${process.versions.unicode}, Swift ${sw.unicode}`; +check(`3b usynlige tegn (Cf): samme ${jsCfB.length} tegn i JS og Swift (${vers})`, forskel(jsCfB, swCfB).length === 0, JSON.stringify(forskel(jsCfB, swCfB))); +check(`3c smaa bogstaver: samme ${jsSmaaB.length} tegn i JS og Swift (${vers})`, forskel(jsSmaaB, swSmaaB).length === 0, JSON.stringify(forskel(jsSmaaB, swSmaaB))); +check(`3d kun tegn den ene runtime ikke kender er udeladt (${udeladt}), og de er faa`, udeladt <= 200, String(udeladt)); // C · kaldestederne const helperJs = readFileSync(join(ROOT, 'mcp-server', 'helper.js'), 'utf8'); From e7d03c5ea4e9962959dfbd18a1f3efa0e65e1f0f Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 12:29:15 +0200 Subject: [PATCH 111/132] fix(open): R19 (Opus) - open_app kraever et PRAECIST id; visningstjeneste-ruten uden usynligt tegn bevogtet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit computer_open {intent:"open_app", bundleId:"Passwords"} blev doemt som id'et «Passwords» (ikke paa adgangskode-listen), mens hjaelperen startede Adgangskoder ved navn - uden spoergsmaal i standardtilstanden. Ogsaa «com.apple.passwords» (listen sammenligner praecist; Launch Services er ufoelsom for store/smaa - MAALT paa Gustavs Mac). Nu slaar porten bundleId op med resolve-app, og svarer hjaelperen ikke PRAECIS samme streng, afvises kaldet i alle tilstande. Loggen faar en fast grund, ikke modellens streng. bundet-maal 7 (5 raekker: navn, store/smaa, praecist id paa lukket program, praecist id paa adgangskodeprogram, fejlet opslag - afvisninger starter intet). usynlige-navne: raekken «ThemeWidgetControlViewService (WhatsApp)» uden U+200E (navnet findes paa maskinen). Mutanter Q1 og X1 roede. 194 ankre. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 24 ++++++++++++++++++++++++ mcp-server/index.js | 15 +++++++++++++++ test/bundet-maal.mjs | 19 +++++++++++++++++++ test/usynlige-navne.mjs | 4 ++++ 4 files changed, 62 insertions(+) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 59a42070..b6e37744 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2318,5 +2318,29 @@ ], "proeve": "test/usynlige-navne.mjs", "forventet": "1a.9" + }, + { + "navn": "Q1-open-app-uden-praecist-id", + "fil": "mcp-server/index.js", + "par": [ + [ + " if (r?.bundleId !== targetBundleId) {\n", + " if (false) {\n" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "7 open_app med navnet" + }, + { + "navn": "X1-visningstjeneste-uden-usynligt-tegn", + "fil": "mcp-server/helper.js", + "par": [ + [ + "return hits.length === 1 && !deltId(hits[0]) ? hits[0] : null;", + "return hits.length === 1 ? hits[0] : null;" + ] + ], + "proeve": "test/usynlige-navne.mjs", + "forventet": "1a.10" } ] diff --git a/mcp-server/index.js b/mcp-server/index.js index 8f399b5e..18ed4dba 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -1350,6 +1350,21 @@ async function haandterKald(request) { : args.intent === 'play_track' ? 'com.spotify.client' : args.intent === 'open_chat' ? 'net.whatsapp.WhatsApp' : null; + // ⛔ R19 (Opus, MAALT): «bundleId: "Passwords"» blev doemt som id'et «Passwords» - ikke paa + // adgangskode-listen - mens hjaelperen startede Adgangskoder ved NAVN. Ogsaa «com.apple.passwords» + // (listen sammenligner praecist). Nu: det program hjaelperen ville starte, skal have PRAECIS den + // streng agenten skrev som id - ellers afvises kaldet, i alle tilstande. + if (args.intent === 'open_app' && targetBundleId) { + let r = null; + try { r = await callHelper(['resolve-app', '--app', targetBundleId], { timeout: 15000 }); } catch {} + if (r?.bundleId !== targetBundleId) { + const grund = `open_app needs the exact bundle id - '${targetBundleId}' ${r?.bundleId ? `resolves to ${r.bundleId}` : 'is not an installed app'}`; + // Loggen faar en fast grund - aldrig modellens streng (Astra 25/9). + record({ tool: name, tier: tool.tier, args: scrubArgs(args), mode: currentMode(), + target: r?.bundleId || null, decision: 'denied', asked: false, reason: 'open_app needs the exact bundle id' }); + return errorResult(`Refused: ${grund}. Pass the bundle id itself. Nothing was done.`); + } + } } // ⛔ FABLE 24/9: et LUKKET program findes ikke blandt de koerende, saa // `computer_launch` blev altid «ukendt maal» og afvist - vaerktoejet diff --git a/test/bundet-maal.mjs b/test/bundet-maal.mjs index 9d3e2953..b129b4c0 100644 --- a/test/bundet-maal.mjs +++ b/test/bundet-maal.mjs @@ -126,6 +126,25 @@ const appArgv = (k) => { const i = k.argv.indexOf('--app'); return i >= 0 ? k.ar srv.kill(); } +// 7 · computer_open open_app: kun et PRAECIST id (R19, Opus - maalt: «Passwords» startede Adgangskoder uden spoergsmaal) +for (const [bundleId, svar, maaStarte, hvad] of [ + ['Passwords', { app: 'Passwords', bundleId: 'com.apple.Passwords', running: false }, false, 'navnet paa et adgangskodeprogram'], + ['com.apple.passwords', { app: 'com.apple.passwords', bundleId: 'com.apple.Passwords', running: false }, false, 'id med andre store/smaa'], + ['com.spotify.client', { app: 'com.spotify.client', bundleId: 'com.spotify.client', running: false }, true, 'et praecist id paa et lukket program'], + // R20 (Astra): det praecise id paa et adgangskodeprogram afvises af adgangskode-reglen; et fejlet opslag afvises + ['com.apple.Passwords', { app: 'com.apple.Passwords', bundleId: 'com.apple.Passwords', running: false }, false, 'det praecise id paa et adgangskodeprogram'], + ['dk.findes.ikke', { ok: false, code: 'not-found', error: 'could not find' }, false, 'et opslag der fejler'], +]) { + const { srv, rpc, kald, hj } = klient({ apps: { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: true }] }, 'resolve-app': svar }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); + const r = await kald('computer_open', { intent: 'open_app', bundleId }); + const start = hj.kald().filter(k => k.argv[0] === 'launch'); + check(`7 open_app med ${hvad} («${bundleId}»): ${maaStarte ? 'startes' : 'afvist, intet startet'}`, + maaStarte ? (start.length === 1 && appArgv(start[0]) === bundleId) : (r.fejl && start.length === 0), + JSON.stringify(start.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 140)); + srv.kill(); +} + // 5 · bindingen dækker ogsaa et usloeret skaermbillede, som porten vurderer som en skrivning (R18, Astra) { const { readFileSync } = await import('node:fs'); diff --git a/test/usynlige-navne.mjs b/test/usynlige-navne.mjs index e0a7a6eb..bfaebbf7 100644 --- a/test/usynlige-navne.mjs +++ b/test/usynlige-navne.mjs @@ -63,6 +63,10 @@ const APPS = [ [VIS.ids, VIS.navne, 'Autoudfyld (Google Chrome)', null, 'en visningstjeneste: id delt med et andet navn - afvist'], [VIS.ids, VIS.navne, 'Autoudfyld (Agent360 IDE)', null, 'ogsaa den anden visningstjeneste'], [VIS.ids, VIS.navne, 'Google Chrome', 2, 'to processer med samme id OG samme navn: den foerste, som foer'], + // R19 (Opus): ruten UDEN det usynlige tegn - navnet findes saadan paa Gustavs Mac (maalt) + [['com.apple.ThemeWidgetControlViewService', 'com.apple.ThemeWidgetControlViewService'], + ['ThemeWidgetControlViewService (Finder)', `${LRM}ThemeWidgetControlViewService (WhatsApp)`], + 'ThemeWidgetControlViewService (WhatsApp)', null, 'en visningstjeneste fundet uden sit usynlige tegn: stadig afvist'], [VIS.ids, VIS.navne, 'com.apple.SafariPlatformSupport.Helper', 0, 'id\'et selv: den foerste proces med id\'et, som foer'], ]; // A3 · oversaettelsen ved hjaelperens indgang: [argv, opslag, forventet argv, hvad] From d40872cc6dd949bc24895f0326bb2fdbe6b2fef0 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 12:39:04 +0200 Subject: [PATCH 112/132] fix(open): R20 (Opus) - formkrav foer opslaget, og noeglering/terminal i proeven Samme skaerpelser som 0.2.1 (9e583b4): open_app's id tjekkes mod leveringens formkrav FOER resolve-app, saa ingen spoerges om noget der afvises; proeven daekker ogsaa com.apple.KeychainAccess og com.apple.terminal (begge slap udenom med en anden stavemaade, maalt af Opus) og at et ugyldigt id ikke slaar noget op. Mutant Q2 roed. 195 ankre. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ mcp-server/index.js | 6 ++++++ test/bundet-maal.mjs | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index b6e37744..94268866 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2342,5 +2342,17 @@ ], "proeve": "test/usynlige-navne.mjs", "forventet": "1a.10" + }, + { + "navn": "Q2-open-app-uden-formkrav", + "fil": "mcp-server/index.js", + "par": [ + [ + " if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,119}$/.test(targetBundleId)) {\n", + " if (false) {\n" + ] + ], + "proeve": "test/bundet-maal.mjs", + "forventet": "7b" } ] diff --git a/mcp-server/index.js b/mcp-server/index.js index 18ed4dba..c25eedc4 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -1355,6 +1355,12 @@ async function haandterKald(request) { // (listen sammenligner praecist). Nu: det program hjaelperen ville starte, skal have PRAECIS den // streng agenten skrev som id - ellers afvises kaldet, i alle tilstande. if (args.intent === 'open_app' && targetBundleId) { + // Samme formkrav som leveringen - FOER opslaget, saa ingen spoerges om noget der afvises (R20, Opus). + if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,119}$/.test(targetBundleId)) { + record({ tool: name, tier: tool.tier, args: scrubArgs(args), mode: currentMode(), + decision: 'denied', asked: false, reason: 'open_app needs a valid bundle id' }); + return errorResult('Refused: open_app needs a valid bundle id like com.spotify.client. Nothing was done.'); + } let r = null; try { r = await callHelper(['resolve-app', '--app', targetBundleId], { timeout: 15000 }); } catch {} if (r?.bundleId !== targetBundleId) { diff --git a/test/bundet-maal.mjs b/test/bundet-maal.mjs index b129b4c0..eb9dd415 100644 --- a/test/bundet-maal.mjs +++ b/test/bundet-maal.mjs @@ -134,6 +134,10 @@ for (const [bundleId, svar, maaStarte, hvad] of [ // R20 (Astra): det praecise id paa et adgangskodeprogram afvises af adgangskode-reglen; et fejlet opslag afvises ['com.apple.Passwords', { app: 'com.apple.Passwords', bundleId: 'com.apple.Passwords', running: false }, false, 'det praecise id paa et adgangskodeprogram'], ['dk.findes.ikke', { ok: false, code: 'not-found', error: 'could not find' }, false, 'et opslag der fejler'], + // R20 (Opus, MAALT): ogsaa noeglering og terminal slap udenom med en anden stavemaade + ['com.apple.KeychainAccess', { app: 'com.apple.KeychainAccess', bundleId: 'com.apple.keychainaccess', running: false }, false, 'noeglering med andre store/smaa'], + ['com.apple.terminal', { app: 'com.apple.terminal', bundleId: 'com.apple.Terminal', running: false }, false, 'terminal med andre store/smaa'], + ['../Passwords', { app: 'Passwords', bundleId: 'com.apple.Passwords', running: false }, false, 'et ugyldigt id (formkravet foer opslaget)'], ]) { const { srv, rpc, kald, hj } = klient({ apps: { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: true }] }, 'resolve-app': svar }); await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'bundet', version: '1' } }); @@ -142,6 +146,10 @@ for (const [bundleId, svar, maaStarte, hvad] of [ check(`7 open_app med ${hvad} («${bundleId}»): ${maaStarte ? 'startes' : 'afvist, intet startet'}`, maaStarte ? (start.length === 1 && appArgv(start[0]) === bundleId) : (r.fejl && start.length === 0), JSON.stringify(start.map(k => k.argv)) + ' · ' + r.tekst.slice(0, 140)); + if (bundleId === '../Passwords') { + const opslag = hj.kald().filter(k => k.argv[0] === 'resolve-app'); + check('7b et ugyldigt id afvises af formkravet FOER noget slaas op', /valid bundle id/.test(r.tekst) && opslag.length === 0, `${opslag.length} opslag`); + } srv.kill(); } From 64c2905ee48b007f39be30d6f99e8c0de691c3c9 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 20:34:02 +0200 Subject: [PATCH 113/132] =?UTF-8?q?ikon:=20skaermlaanet=20staar=20i=20boks?= =?UTF-8?q?en=20med=20=C2=ABTake=20the=20screen=20back=20now=C2=BB=20(R22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Et stille laan kunne kun ses i menulinjen, og to spoergsmaal i menulinjen udloeb 9/10, fordi ikonet ikke blev fundet. Nu holder et aktivt laan boksen fremme - ogsaa stille og ogsaa naar boksen er slaaet fra - med hvem, hvor laenge og stopknappen foerst. Knappen gaar menuens vej (tagTilbageNu), virker uden pause, Touch ID og engangsnummer, og slaas aldrig fra. Boksen ligger nu paa statuslinjens lag (isFloatingPanel nulstillede det til 3, maalt R22). ikon-boks: 6e, 7a-7c, 4c, 5n-5q; mutanter T1-T8 roede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 96 ++++++++++++++++++++++++++ helper/Sources/cmcp-status/Tekst.swift | 38 +++++++++- helper/Sources/cmcp-status/main.swift | 37 +++++++--- test/ikon-boks.mjs | 45 ++++++++++-- 4 files changed, 201 insertions(+), 15 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 94268866..d58e3032 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2354,5 +2354,101 @@ ], "proeve": "test/bundet-maal.mjs", "forventet": "7b" + }, + { + "navn": "T1-stille-laan-uden-stopknap", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " knapper: [TAG_TILBAGE] + b.knapper)\n}\n", + " knapper: b.knapper)\n}\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "7a" + }, + { + "navn": "T2-laan-og-spoergsmaal-uden-stopknap", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " knapper: [TAG_TILBAGE] + b.knapper)\n }\n", + " knapper: b.knapper)\n }\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "7b" + }, + { + "navn": "T3-stopknappen-venter-paa-pausen", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " if knap == TAG_TILBAGE { return .tagTilbage }\n", + " if knap == TAG_TILBAGE && aktive && knapNonce == visteNonce { return .tagTilbage }\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "6e" + }, + { + "navn": "T4-laanet-holder-ikke-boksen-fremme", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if laan == nil && (s.isEmpty || boksSlaaetFra || !arbejder) {\n", + " if (s.isEmpty || boksSlaaetFra || !arbejder) {\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5n" + }, + { + "navn": "T5-laanet-ikke-i-boksen", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "venter: venter, laan: laan),", + "venter: venter)," + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5n" + }, + { + "navn": "T6-boksens-stopknap-goer-intet", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " case .tagTilbage: tagTilbageNu(kilde: \"take-back-box\")\n", + " case .tagTilbage: break\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5o" + }, + { + "navn": "T7-stopknappen-slaas-fra", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + "b.isEnabled = aktiv || b.title == TAG_TILBAGE }", + "b.isEnabled = aktiv }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5p" + }, + { + "navn": "T8-boksen-paa-svaevelaget", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " isFloatingPanel = true\n level = .statusBar\n", + " level = .statusBar\n isFloatingPanel = true\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5q" } ] diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index 3a3f7fc5..a4ec5744 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -54,10 +54,42 @@ func boksKnap(_ menuKnap: String) -> String { menuKnap == "Allow… (confirm with Touch ID)" ? "Allow (Touch ID)" : menuKnap } +/// Knappen der stopper et skaerm-laan. Den staar i menuen OG i boksen, saa laenge +/// laanet varer (R22, Astra + Opus: et stille laan kunne kun ses i menuen, og to +/// spoergsmaal i menulinjen udloeb 9/10, fordi mennesket ikke fandt ikonet). +let TAG_TILBAGE = "Take the screen back now" + +/// Linjen om laanet - menuens oeverste linje og boksens, samme tekst. +func laanTekst(klient: String?, minutterTilbage: Int) -> String { + "\(laanNavn(klient)) is using your screen — \(minutterTilbage) min left" +} + +/// Agentens navn i laanets linjer: usynlige tegn vasket og ingen kantmellemrum. +func laanNavn(_ klient: String?) -> String { + let n = renTekst(klient ?? "").trimmingCharacters(in: .whitespaces) + return n.isEmpty ? "An agent" : n +} + /// `arbejder`: dem der arbejder nu (navn, hvilket program, hvad de goer). /// `venter`: det foerste aabne spoergsmaal og menuens knapper for det. +/// `laan`: et aktivt skaerm-laan - saa staar det oeverst, og stopknappen er foerst. func boksIndhold(arbejder: [(navn: String, maal: String?, nu: String)], tilsluttede: Int, - venter: (antal: Int, klient: String?, tekst: String, fakta: [String], menuKnapper: [String])?) -> BoksIndhold { + venter: (antal: Int, klient: String?, tekst: String, fakta: [String], menuKnapper: [String])?, + laan: (klient: String?, minutter: Int)? = nil) -> BoksIndhold { + let b = boksIndholdUdenLaan(arbejder: arbejder, tilsluttede: tilsluttede, venter: venter) + guard let l = laan else { return b } + if venter != nil { + return BoksIndhold(titel: b.titel, orange: true, + linjer: [laanTekst(klient: l.klient, minutterTilbage: l.minutter)] + b.linjer, + knapper: [TAG_TILBAGE] + b.knapper) + } + return BoksIndhold(titel: "\(laanNavn(l.klient)) is using your screen", orange: true, + linjer: ["\(l.minutter) min left - each step waits while you use the mouse or keyboard"] + b.linjer, + knapper: [TAG_TILBAGE] + b.knapper) +} + +private func boksIndholdUdenLaan(arbejder: [(navn: String, maal: String?, nu: String)], tilsluttede: Int, + venter: (antal: Int, klient: String?, tekst: String, fakta: [String], menuKnapper: [String])?) -> BoksIndhold { if let v = venter { let hel = renTekst(v.tekst) let helVist = hel.count <= BOKS_MAX_TEGN @@ -97,12 +129,14 @@ enum TouchIdUdfald: Equatable { case laan, svar(Bool) } /// overlevede proeven). func touchIdUdfald(ok: Bool, erLaan: Bool) -> TouchIdUdfald { ok && erLaan ? .laan : .svar(ok) } -enum BoksHandling: Equatable { case foelg, tillad(String), afvis(String), gjort(String), hentFrem(String), intet } +enum BoksHandling: Equatable { case foelg, tagTilbage, tillad(String), afvis(String), gjort(String), hentFrem(String), intet } /// Hvad et tryk paa en boksknap betyder. Knappen baerer sit eget spoergsmaal (`knapNonce`); /// er det ikke det boksen viser nu, eller er knapperne ikke aktive, sker intet. func boksHandling(knap: String, knapNonce: String?, visteNonce: String?, aktive: Bool) -> BoksHandling { if knap == "Follow" { return .foelg } + // At STOPPE venter aldrig: ingen pause, intet Touch ID, intet engangsnummer. + if knap == TAG_TILBAGE { return .tagTilbage } guard aktive, let n = knapNonce, n == visteNonce else { return .intet } switch knap { case "Allow (Touch ID)": return .tillad(n) diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index 38753c7c..874d7325 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -340,7 +340,8 @@ final class Boks: NSPanel { } func opdaterKnapper() { let aktiv = nonce == nil || knapperAktive() - for case let b as NSButton in knapper.arrangedSubviews { b.isEnabled = aktiv } + // Stopknappen slaas aldrig fra: at tage skaermen tilbage maa aldrig vente (R22). + for case let b as NSButton in knapper.arrangedSubviews { b.isEnabled = aktiv || b.title == TAG_TILBAGE } } /// Den skaerm boksen sidst blev sat paa. private(set) var placeretPaa: CGRect? = nil @@ -352,8 +353,11 @@ final class Boks: NSPanel { super.init(contentRect: NSRect(x: 0, y: 0, width: bredde, height: 78), styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false) - level = .statusBar + // ⛔ R22 (Opus, MAALT): `isFloatingPanel = true` nulstiller `level` til det almindelige + // svaevelag (3), saa boksen - og dens stopknap - kunne daekkes af ethvert andet + // programs svaevende panel. Laget saettes derfor EFTER. isFloatingPanel = true + level = .statusBar becomesKeyOnlyIfNeeded = true hidesOnDeactivate = false isMovableByWindowBackground = true @@ -517,7 +521,7 @@ func spoergsmaalMenu(_ s: Spoergsmaal, aktivtAndetLaan: (klient: String?, til: D /// Oeverst i menuen mens skaermen er laant ud. func laanLinjer(klient: String?, til: Date) -> [String] { let rest = max(0, Int(ceil(til.timeIntervalSinceNow / 60))) - return ["\(klient ?? "An agent") is using your screen — \(rest) min left", "Take the screen back now"] + return [laanTekst(klient: klient, minutterTilbage: rest), TAG_TILBAGE] } if CommandLine.arguments.contains("--dump-question") { @@ -546,7 +550,13 @@ if CommandLine.arguments.contains("--dump-question") { return ["title": b.titel, "orange": b.orange, "lines": b.linjer, "buttons": b.knapper] }()] if let v = m.ventetekst { ud["waitingForLoan"] = v } - if s.kind == "screen" { ud["whileLent"] = laanLinjer(klient: s.client, til: Date().addingTimeInterval(Double(max(1, min(15, s.minutes ?? 10))) * 60)) } + if s.kind == "screen" { + let minutter = max(1, min(15, s.minutes ?? 10)) + ud["whileLent"] = laanLinjer(klient: s.client, til: Date().addingTimeInterval(Double(minutter) * 60)) + // Boksen mens laanet varer (R22) - samme funktion som den rigtige boks. + let b = boksIndhold(arbejder: [], tilsluttede: 1, venter: nil, laan: (klient: s.client, minutter: minutter)) + ud["boxWhileLent"] = ["title": b.titel, "orange": b.orange, "lines": b.linjer, "buttons": b.knapper] + } let data = try! JSONSerialization.data(withJSONObject: ud, options: [.prettyPrinted, .sortedKeys]) FileHandle.standardOutput.write(data) FileHandle.standardOutput.write("\n".data(using: .utf8)!) @@ -731,7 +741,13 @@ final class Ikon: NSObject, NSMenuDelegate { let arbejder = s.contains { $0.now != nil } || s.contains { (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 } || !anmodninger.filter { !$0.besvaret }.isEmpty - if s.isEmpty || boksSlaaetFra || !arbejder { + // ⛔ R22: et aktivt skaerm-laan holder boksen fremme - ogsaa naar agenten er stille, + // og ogsaa naar boksen er slaaet fra i menuen - for stopknappen skal kunne ses. + let laan: (klient: String?, minutter: Int)? = { + guard let l = aktivtLaan, !l.lukket, let til = laanTil else { return nil } + return (klient: l.s.client, minutter: max(0, Int(ceil(til.timeIntervalSinceNow / 60)))) + }() + if laan == nil && (s.isEmpty || boksSlaaetFra || !arbejder) { if boks.isVisible { boks.orderOut(nil) } } else { let aktive = s.filter { $0.now != nil || (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 } @@ -744,7 +760,7 @@ final class Ikon: NSObject, NSMenuDelegate { (navn: navn(sess), maal: senesteMaal(sess), nu: sess.now.map { $0.text } ?? sess.recent.last.map { "idle - last: \($0.text) (\(siden($0.ts)))" } ?? "idle") } - boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter), + boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter, laan: laan), nonce: foerste?.s.nonce, sessioner: aktive) if !boks.isVisible { boks.placer(); boks.orderFrontRegardless() } else if boks.skalFlyttes() { boks.placer() } @@ -928,6 +944,7 @@ final class Ikon: NSObject, NSMenuDelegate { // aktive (R17: Astra + Opus) - ellers sker intet. Afgoeres i boksHandling (Tekst.swift). switch boksHandling(knap: knap, knapNonce: n, visteNonce: boks.nonce, aktive: boks.knapperAktive()) { case .foelg: foelgFraBoks() + case .tagTilbage: tagTilbageNu(kilde: "take-back-box") case .tillad(let n): tilladNonce(n, kilde: "allow-box") case .gjort(let n): gjortNonce(n, kilde: "done-box") case .hentFrem(let n): hentFremNonce(n) @@ -974,9 +991,13 @@ final class Ikon: NSObject, NSMenuDelegate { } /// Tag skaermen tilbage: intet Touch ID - at STOPPE kraever aldrig bevis. - @objc func tagTilbage() { - noterKilde("take-back") + @objc func tagTilbage() { tagTilbageNu(kilde: "take-back") } + + /// Menuens og boksens stopknap: samme vej, hvert sit kildemaerke (R22). + func tagTilbageNu(kilde: String) { + noterKilde(kilde) aktivtLaan?.afslutLaan() + tik() } /// «Done» paa et goer-selv-spoergsmaal: et signal, ikke et samtykke. diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 48c70c51..7d34b0af 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -28,7 +28,8 @@ struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; le struct Hd: Decodable { let knap: String; let knapNonce: String?; let visteNonce: String?; let aktive: Bool } struct Ak: Decodable { let siden: Double; let iGang: Bool } struct Ti: Decodable { let ok: Bool; let laan: Bool } -struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V? } +struct L: Decodable { let klient: String?; let min: Int } +struct I: Decodable { let arbejder: [Ag]; let tilsluttede: Int; let venter: V?; let laan: L? } struct R: Decodable { let x: Double; let y: Double; let w: Double; let h: Double } struct S: Decodable { let vindue: R?; let mus: [Double]; let skaerme: [R] } struct H: Decodable { let synlig: R; let bredde: Double } @@ -42,7 +43,8 @@ let r = { (a: R) in CGRect(x: a.x, y: a.y, width: a.w, height: a.h) } let ud: [String: Any] = [ "indhold": ind.indhold.map { i -> [String: Any] in let b = boksIndhold(arbejder: i.arbejder.map { (navn: $0.navn, maal: $0.maal, nu: $0.nu) }, tilsluttede: i.tilsluttede, - venter: i.venter.map { (antal: $0.antal, klient: $0.klient, tekst: $0.tekst, fakta: $0.fakta, menuKnapper: $0.menuKnapper) }) + venter: i.venter.map { (antal: $0.antal, klient: $0.klient, tekst: $0.tekst, fakta: $0.fakta, menuKnapper: $0.menuKnapper) }, + laan: i.laan.map { (klient: $0.klient, minutter: $0.min) }) return ["titel": b.titel, "orange": b.orange, "linjer": b.linjer, "knapper": b.knapper] }, "skaerm": ind.skaerm.map { s in boksSkaerm(forrestVindue: s.vindue.map(r), mus: CGPoint(x: s.mus[0], y: s.mus[1]), skaerme: s.skaerme.map(r)) }, "cocoa": ind.cocoa.map { c in let x = cocoaRamme(r(c), hovedHoejde: 1112); return [x.minX, x.minY, x.width, x.height] }, @@ -54,7 +56,7 @@ let ud: [String: Any] = [ "handling": ind.handling.map { h -> String in switch boksHandling(knap: h.knap, knapNonce: h.knapNonce, visteNonce: h.visteNonce, aktive: h.aktive) { case .foelg: return "foelg"; case .tillad(let n): return "tillad:" + n; case .afvis(let n): return "afvis:" + n - case .gjort(let n): return "gjort:" + n; case .hentFrem(let n): return "hentFrem:" + n; case .intet: return "intet" } }, + case .gjort(let n): return "gjort:" + n; case .hentFrem(let n): return "hentFrem:" + n; case .tagTilbage: return "tagTilbage"; case .intet: return "intet" } }, "aktive": ind.aktive.map { boksKnapperAktive(sidenNytSpoergsmaal: $0.siden, touchIdIGang: $0.iGang) }, "pause": BOKS_PAUSE, "touchId": ind.touchId.map { t -> String in switch touchIdUdfald(ok: t.ok, erLaan: t.laan) { case .laan: return "laan"; case .svar(let v): return v ? "ja" : "nej" } }, @@ -78,6 +80,9 @@ const ind = { { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Use your screen for 2 minutes', fakta: [], menuKnapper: ['Deny'] } }, { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude‮', tekst: 'x'.repeat(280), fakta: [], menuKnapper: [ALLOW_MENU, 'Deny'] } }, { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Claude', tekst: 'Type 42 characters', fakta: [SCOPE, 'Lands in: com.apple.Terminal'], menuKnapper: [ALLOW_MENU, 'Deny'] } }, + { arbejder: [], tilsluttede: 1, venter: null, laan: { klient: 'Claude', min: 2 } }, + { arbejder: [], tilsluttede: 1, venter: { antal: 1, klient: 'Codex', tekst: 'Press Send in Mail', fakta: [], menuKnapper: [ALLOW_MENU, 'Deny'] }, laan: { klient: 'Claude', min: 7 } }, + { arbejder: [{ navn: 'Claude · c753', maal: 'com.apple.Notes', nu: 'Type in Noter' }], tilsluttede: 4, venter: null, laan: { klient: 'Claude‮', min: 1 } }, ], skaerm: [ { vindue: { x: 1800, y: 100, w: 1400, h: 900 }, mus: [100, 100], skaerme: [MAC, BRED] }, // vinduet paa den brede, musen paa Mac'en @@ -98,6 +103,8 @@ const ind = { { knap: 'Follow', knapNonce: null, visteNonce: null, aktive: false }, { knap: 'Allow (Touch ID)', knapNonce: null, visteNonce: null, aktive: true }, { knap: 'Allow… (confirm with Touch ID)', knapNonce: 'n1', visteNonce: 'n1', aktive: true }, + { knap: 'Take the screen back now', knapNonce: null, visteNonce: 'n1', aktive: false }, + { knap: 'Take the screen back now', knapNonce: 'n0', visteNonce: null, aktive: false }, ], touchId: [{ ok: false, laan: false }, { ok: false, laan: true }, { ok: true, laan: false }, { ok: true, laan: true }], aktive: [{ siden: 0.5, iGang: false }, { siden: 1.0, iGang: false }, { siden: 5, iGang: true }, { siden: 5, iGang: false }], @@ -112,7 +119,7 @@ const ind = { })(), }; const s = JSON.parse(execFileSync(BIN, { input: JSON.stringify(ind), encoding: 'utf8' })); -const [n2, n5, q1, qLang, qSelv, qLaan, qGraense, qTerm] = s.indhold; +const [n2, n5, q1, qLang, qSelv, qLaan, qGraense, qTerm, lStille, lSpoerg, lArb] = s.indhold; check('1a to agenter: titlen siger hvor mange der arbejder, og hvor mange der er tilsluttet', n2.titel === 'Computer MCP - 2 agents working · 12 connected' && !n2.orange, n2.titel); check('1b hver agent: navn, program og hvad den goer nu', n2.linjer[0] === '● Claude · c753 · com.apple.Notes' && n2.linjer[1].trim() === 'Press «Format» in Noter' && n2.linjer[2] === '● Codex · 9f1', JSON.stringify(n2.linjer)); check('1c hoejst tre agenter, resten som et tal', n5.linjer.filter(l => l.startsWith('●')).length === 3 && n5.linjer.at(-1) === '+2 more working', JSON.stringify(n5.linjer)); @@ -142,7 +149,18 @@ check('3c vinduets ramme omregnes fra oeverst-venstre til Cocoas nederst-venstre check('6a knapperne: Allow -> Touch ID-vejen paa KNAPPENS spoergsmaal; Deny og «I won\'t» er nej; Done er gjort; Take me there henter frem', JSON.stringify(s.handling.slice(0, 7)) === JSON.stringify(['tillad:n1', 'intet', 'intet', 'afvis:n1', 'afvis:n1', 'gjort:n1', 'hentFrem:n1']), JSON.stringify(s.handling)); check('6b Follow virker altid; uden spoergsmaal eller med en ukendt knap sker intet', - JSON.stringify(s.handling.slice(7)) === JSON.stringify(['foelg', 'intet', 'intet']), JSON.stringify(s.handling.slice(7))); + JSON.stringify(s.handling.slice(7, 10)) === JSON.stringify(['foelg', 'intet', 'intet']), JSON.stringify(s.handling.slice(7))); +check('6e «Take the screen back now» virker ALTID: uden pause, uden Touch ID-vent og uanset hvilket spoergsmaal boksen viser (R22)', + JSON.stringify(s.handling.slice(10)) === JSON.stringify(['tagTilbage', 'tagTilbage']), JSON.stringify(s.handling.slice(10))); +check('7a et STILLE laan staar i boksen: orange, hvem, hvor laenge, og stopknappen (R22: laanet kunne kun ses i menuen)', + lStille.orange && lStille.titel === 'Claude is using your screen' && /^2 min left/.test(lStille.linjer[0]) + && JSON.stringify(lStille.knapper) === '["Take the screen back now"]', JSON.stringify(lStille)); +check('7b et laan OG et spoergsmaal: spoergsmaalet beholder titel og knapper, laanet staar oeverst, og stopknappen er foerst', + lSpoerg.titel === 'Codex needs you' && lSpoerg.linjer[0] === 'Claude is using your screen — 7 min left' && lSpoerg.linjer[1] === 'Press Send in Mail' + && JSON.stringify(lSpoerg.knapper) === '["Take the screen back now","Allow (Touch ID)","Deny"]', JSON.stringify(lSpoerg)); +check('7c et laan mens agenter arbejder: stopknappen foerst, Follow bagefter; usynlige tegn i navnet vasket', + lArb.titel === 'Claude is using your screen' && lArb.linjer.includes('● Claude · c753 · com.apple.Notes') + && JSON.stringify(lArb.knapper) === '["Take the screen back now","Follow"]', JSON.stringify(lArb)); check('6d Touch ID: et nej er et nej - ogsaa for et skaerm-laan; kun et ja til et laan bliver et laan', JSON.stringify(s.touchId) === '["nej","nej","ja","laan"]', JSON.stringify(s.touchId)); check(`6c knapperne venter ${s.pause} s efter et nyt spoergsmaal og er fra mens Touch ID er oppe`, @@ -159,6 +177,10 @@ else { && JSON.stringify(b.buttons) === '["Allow (Touch ID)","Deny"]', JSON.stringify(b)); const l = vis({ text: 'Use your screen for 2 minutes: F1', kind: 'screen', minutes: 2, simulateActiveLoan: { client: 'anden', minutesLeft: 3 } }); check('4b ikonet: et andet laan er aktivt - boksen har kun Deny', JSON.stringify(l.buttons) === '["Deny"]', JSON.stringify(l)); + const raw = JSON.parse(execFileSync(ikon, ['--dump-question'], { encoding: 'utf8', input: JSON.stringify({ nonce: 'n', session: 's', client: 'Claude', scope: 'x', target: 'y', expires: 0, text: 'Use your screen for 2 minutes', kind: 'screen', minutes: 2 }) })); + check('4c ikonet: mens laanet varer, viser boksen hvem, hvor laenge og stopknappen - bygget af den rigtige boksIndhold', + raw.boxWhileLent && raw.boxWhileLent.title === 'Claude is using your screen' && /^2 min left/.test(raw.boxWhileLent.lines[0]) + && JSON.stringify(raw.boxWhileLent.buttons) === '["Take the screen back now"]', JSON.stringify(raw.boxWhileLent)); } // 5 · ikonets kode er bundet til reglerne @@ -198,5 +220,18 @@ check('5h flyttes med: ny skaerm-opsaetning, og naar mennesket skifter skaerm', check('5i boksen tager aldrig tastaturet og beder om ikke at blive delt (sharingType none - om optagelser respekterer det, er UMAALT)', /override var canBecomeKey: Bool \{ false \}/.test(m) && /sharingType = \.none/.test(m) && /\.nonactivatingPanel/.test(m)); +const tikKrop = krop('func tik() {'); +check('5n laanet holder boksen fremme - ogsaa stille og ogsaa naar boksen er slaaet fra - og gaar ind i boksIndhold (R22)', + /guard let l = aktivtLaan, !l\.lukket, let til = laanTil else \{ return nil \}/.test(tikKrop) + && /if laan == nil && \(s\.isEmpty \|\| boksSlaaetFra \|\| !arbejder\) \{/.test(tikKrop) + && /boksIndhold\(arbejder: arbejdende, tilsluttede: s\.count, venter: venter, laan: laan\)/.test(tikKrop), tikKrop.slice(0, 200)); +check('5o boksens stopknap er menuens: samme tagTilbageNu, eget kildemaerke, intet Touch ID', + /case \.tagTilbage: tagTilbageNu\(kilde: "take-back-box"\)/.test(knapKrop) + && /@objc func tagTilbage\(\) \{ tagTilbageNu\(kilde: "take-back"\) \}/.test(m) + && /func tagTilbageNu\(kilde: String\) \{\n\s+noterKilde\(kilde\)\n\s+aktivtLaan\?\.afslutLaan\(\)/.test(m)); +check('5p stopknappen slaas aldrig fra - hverken af pausen eller af Touch ID-arket', /b\.isEnabled = aktiv \|\| b\.title == TAG_TILBAGE/.test(m)); +check('5q boksen ligger paa statuslinjens lag, ikke det almindelige svaevelag (isFloatingPanel nulstiller level - maalt R22, Opus)', + /isFloatingPanel = true\n\s+level = \.statusBar/.test(m) && !/level = \.statusBar\n\s+isFloatingPanel = true/.test(m)); + console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From 10f991ae23995919b08292b2b34c58f94d676214 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 20:46:27 +0200 Subject: [PATCH 114/132] tekster peger paa boksen; to foraeldede claims-tjek rettet (R22) Agentens egne tekster (computer_request_screen, computer_ask_user og serverens vejledninger) sendte mennesket til det orange ikon i menulinjen - den flade der fik 0 af 2 svar 9/10. Nu boksen i hjoernet af deres skaerm foerst, og stopknappen naevnes. README og CHANGELOG ligeledes. Fundet undervejs, roede allerede paa d40872c (maalt paa en uroert kopi): - claims 26: bundet-maal.mjs startede en rigtig server uden osascript- attrappen - nu med lavFalskSpoerger, saa ingen aegte dialog kan komme. - claims 6e: koerte i readonly (afviser nu foer opslaget, 431c159) med en helt falsk hjaelper (porten slaar op gennem hjaelperen siden R17) - porten saa derfor null. Nu standardtilstand gennem vagt-hjaelperen: opslag til den aegte, alle handlinger stoppet. Mutant C6e (raa navn i porten) er roed. ikon-boks 8a-8c; claims BESTAAET; bundet-maal groen. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ CHANGELOG.md | 8 ++++++++ README.md | 15 +++++++++------ mcp-server/README.md | 15 +++++++++------ mcp-server/index.js | 7 ++++--- mcp-server/tools.js | 4 ++-- test/bundet-maal.mjs | 4 +++- test/claims.mjs | 12 ++++++++++-- test/ikon-boks.mjs | 14 ++++++++++++++ 9 files changed, 71 insertions(+), 20 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index d58e3032..9640a5b7 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2450,5 +2450,17 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "5q" + }, + { + "navn": "C6e-porten-ser-navnet-ikke-id", + "fil": "mcp-server/index.js", + "par": [ + [ + " ? await resolveBundleId(args.app)\n : await frontmostBundleId();\n", + " ? String(args.app)\n : await frontmostBundleId();\n" + ] + ], + "proeve": "test/claims.mjs", + "forventet": "6e" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 04ed5e87..c925cfdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,14 @@ turns orange and shows the whole question - who, what, where it lands and how long a yes counts - with the menu's own buttons: `Allow (Touch ID)` and `Deny`; the buttons wait a second after a new question appears. Allowing still asks for Touch ID every time; for a question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) +**The screen loan is in the box, with its stop button.** While an agent has your +screen, the box says who and how many minutes are left, with `Take the screen back +now` first - also while the agent is quiet and also when the box is switched off. +The button works at once: no pause, no Touch ID, whichever question the box is +showing. Before, a quiet loan could only be seen in the menu bar. The box now sits +on the status bar's layer, so another app's floating panel cannot cover it, and +the agent is told to send you to the box. (`test/ikon-boks.mjs` 6e, 7a-7c, 4c, +5n-5q, 8a-8c) **WhatsApp by its name.** WhatsApp's name starts with an invisible character (U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: starting it in the background was refused as an unknown app, and so was every diff --git a/README.md b/README.md index 281dd271..2752fa6e 100644 --- a/README.md +++ b/README.md @@ -235,11 +235,13 @@ what you are doing. Many apps bring themselves forward as they start - six of eight did on a clean Mac - and when one does, the front is handed straight back and the answer says `took_screen` and `gave_back`. It is a moment, not nothing. Seven are still held back: `move`, `activate`, `quit`, `space`, `window`, `drag` and `paste` - until you lend -the screen: `computer_request_screen` asks you in the menu bar, one agent at a -time, approved with Touch ID, for at most 15 minutes. While it has the screen, -each step waits while you are using the keyboard or mouse (a step already -running finishes), and `Take the screen back now` ends the loan at once and -stops a step that is still running. Setting `CMCP_BACKGROUND` locks it +the screen: `computer_request_screen` asks you in the box in the corner of your +screen (and in the menu bar), one agent at a time, approved with Touch ID, for at +most 15 minutes. While it has the screen, each step waits while you are using the +keyboard or mouse (a step already running finishes), and `Take the screen back +now` ends the loan at once and stops a step that is still running. That button +stays in the box for as long as the loan lasts - also when the agent is quiet and +when you have switched the box off - and it never asks for Touch ID. Setting `CMCP_BACKGROUND` locks it out entirely. `CMCP_BACKGROUND=0` gives you those too - and a typo will not turn it off, only `0`, `false`, `no` or `off`. `CMCP_MODE=ask` puts one consent dialog per session in front of the @@ -265,7 +267,8 @@ or false, never text. The agent puts the cursor in the field, the dialog names the app and the window it is about to land in - written by the server, not by the model - and you type on your own keyboard. There is deliberately no route through this server for a password to reach a model. In background mode there is -no dialog: the question waits in the menu bar icon, with the whole request, where +no dialog: the question waits in the box in the corner of your screen and under +the menu bar icon, with the whole request, where it lands, and `Take me there` - your click brings the app forward, not the agent's. You do it and choose `Done`. A Done is a signal, not a consent: it can never approve anything else. diff --git a/mcp-server/README.md b/mcp-server/README.md index 37df29fc..eaa401e0 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -233,11 +233,13 @@ what you are doing. Many apps bring themselves forward as they start - six of eight did on a clean Mac - and when one does, the front is handed straight back and the answer says `took_screen` and `gave_back`. It is a moment, not nothing. Seven are still held back: `move`, `activate`, `quit`, `space`, `window`, `drag` and `paste` - until you lend -the screen: `computer_request_screen` asks you in the menu bar, one agent at a -time, approved with Touch ID, for at most 15 minutes. While it has the screen, -each step waits while you are using the keyboard or mouse (a step already -running finishes), and `Take the screen back now` ends the loan at once and -stops a step that is still running. Setting `CMCP_BACKGROUND` locks it +the screen: `computer_request_screen` asks you in the box in the corner of your +screen (and in the menu bar), one agent at a time, approved with Touch ID, for at +most 15 minutes. While it has the screen, each step waits while you are using the +keyboard or mouse (a step already running finishes), and `Take the screen back +now` ends the loan at once and stops a step that is still running. That button +stays in the box for as long as the loan lasts - also when the agent is quiet and +when you have switched the box off - and it never asks for Touch ID. Setting `CMCP_BACKGROUND` locks it out entirely. `CMCP_BACKGROUND=0` gives you those too - and a typo will not turn it off, only `0`, `false`, `no` or `off`. `CMCP_MODE=ask` puts one consent dialog per session in front of the @@ -263,7 +265,8 @@ or false, never text. The agent puts the cursor in the field, the dialog names the app and the window it is about to land in - written by the server, not by the model - and you type on your own keyboard. There is deliberately no route through this server for a password to reach a model. In background mode there is -no dialog: the question waits in the menu bar icon, with the whole request, where +no dialog: the question waits in the box in the corner of your screen and under +the menu bar icon, with the whole request, where it lands, and `Take me there` - your click brings the app forward, not the agent's. You do it and choose `Done`. A Done is a signal, not a consent: it can never approve anything else. diff --git a/mcp-server/index.js b/mcp-server/index.js index c25eedc4..2c2cd430 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -209,7 +209,8 @@ can reach by hand, but some steps stay theirs to take: a login or password, the go-ahead to send a message to a real person, or something macOS only lets a person do. When you hit one, say plainly what you need and ask the person to take that step - \`computer_ask_user\` puts the question to them and returns their answer. In -background mode it waits in the menu bar icon: name the \`app\` whose field you +background mode it waits in the Computer MCP box in the corner of their screen and +under the menu bar icon: name the \`app\` whose field you prepared, and the person brings it forward themselves, does it, and chooses Done; in the foreground it is a dialog. If the icon is not running it is refused - then say in your reply what you need instead of trying to force it. You never type a @@ -1145,7 +1146,7 @@ async function runTool(name, args) { if (baggrund()) { if (!args.app) { return errorResult('Refused: in background mode, name the `app` whose field the person should use - the field you put the cursor in with computer_press. ' + - 'The question then waits in the menu bar icon, and nothing is brought to the front.'); + 'The question then waits in the box in the corner of their screen and under the menu bar icon, and nothing is brought to the front.'); } const bid = await resolveBundleId(appArg(args)); if (!bid) return errorResult(`Refused: '${args.app}' is not running, so there is no field to type in. Use computer_apps for the exact name.`); @@ -1643,7 +1644,7 @@ async function haandterKald(request) { `In background mode the server never moves the pointer, sends a key press, ` + `brings an app forward, switches desktop, or raises a dialog of its own.\n` + `If this step genuinely needs the screen, ask the person to lend it to you with ` + - `computer_request_screen - they approve it in the menu bar, for a few minutes.\n` + + `computer_request_screen - they approve it in the box in the corner of their screen (or the menu bar), for a few minutes.\n` + `Otherwise use the quiet route: computer_find to locate the element, then ` + `computer_press or computer_set_value - they act on a window behind another ` + `one and leave the pointer where the person put it.` diff --git a/mcp-server/tools.js b/mcp-server/tools.js index b0894436..4532d23d 100644 --- a/mcp-server/tools.js +++ b/mcp-server/tools.js @@ -313,7 +313,7 @@ export const TOOLS = [ { name: 'computer_request_screen', tier: TIER.WRITE, - description: 'Ask the person to lend you the screen for a while - for the few steps that cannot be done from behind: moving the pointer, dragging, bringing a window forward, switching desktop. Before calling this, tell the person in the chat exactly what to do: click the orange icon in the menu bar, then Allow, then confirm with Touch ID - this call then waits (several minutes) for them to do that, so do not call it silently. They approve it with Touch ID; you get it for at most 15 minutes, only you, and they can take it back at any moment. While you have it, the tools that take the screen are offered to you, and each one pauses while the person is using the keyboard or mouse. Password apps, deletions, and messages in the apps and web chats it recognises still ask. Say in `reason` exactly what you need to do. action "release" hands it back when you are done; "status" tells you whether you have it. Refused if the person has locked the server to background (CMCP_BACKGROUND set).', + description: 'Ask the person to lend you the screen for a while - for the few steps that cannot be done from behind: moving the pointer, dragging, bringing a window forward, switching desktop. Before calling this, tell the person in the chat exactly what to do: press Allow (Touch ID) in the Computer MCP box in the top-right corner of the screen they are using (the same question is also under the orange menu bar icon), then confirm with Touch ID - this call then waits (several minutes) for them to do that, so do not call it silently. They approve it with Touch ID; you get it for at most 15 minutes, only you, and they can take it back at any moment with Take the screen back now, which stays in that box for as long as the loan lasts. While you have it, the tools that take the screen are offered to you, and each one pauses while the person is using the keyboard or mouse. Password apps, deletions, and messages in the apps and web chats it recognises still ask. Say in `reason` exactly what you need to do. action "release" hands it back when you are done; "status" tells you whether you have it. Refused if the person has locked the server to background (CMCP_BACKGROUND set).', inputSchema: { type: 'object', required: ['action'], @@ -327,7 +327,7 @@ export const TOOLS = [ { name: 'computer_ask_user', tier: TIER.WRITE, - description: 'Ask the human to do something themselves, and wait. Use it for anything you must NOT see: a password, a 2FA code, a CAPTCHA, an OAuth consent. Put the cursor in the right field first (computer_find, then computer_press), then call this - the human types on their own keyboard and presses Done. You get back true or false, never the text. There is deliberately no way to receive a secret through this server; if you need one typed, this is the only route. In background mode (the default) the question waits in the menu bar icon instead of a dialog: name the `app` whose field you prepared, and the person brings it forward themselves, does it, and chooses Done.', + description: 'Ask the human to do something themselves, and wait. Use it for anything you must NOT see: a password, a 2FA code, a CAPTCHA, an OAuth consent. Put the cursor in the right field first (computer_find, then computer_press), then call this - the human types on their own keyboard and presses Done. You get back true or false, never the text. There is deliberately no way to receive a secret through this server; if you need one typed, this is the only route. In background mode (the default) the question waits in the Computer MCP box in the top-right corner of their screen (and under the menu bar icon) instead of a dialog: name the `app` whose field you prepared, and the person brings it forward themselves, does it, and chooses Done.', inputSchema: { type: 'object', required: ['message'], diff --git a/test/bundet-maal.mjs b/test/bundet-maal.mjs index eb9dd415..95f85102 100644 --- a/test/bundet-maal.mjs +++ b/test/bundet-maal.mjs @@ -15,7 +15,7 @@ import { join, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; import { mkdtempSync } from 'node:fs'; import { tmpdir } from 'node:os'; -import { lavFalskHjaelper } from './falsk-hjaelper.mjs'; +import { lavFalskHjaelper, lavFalskSpoerger } from './falsk-hjaelper.mjs'; const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); const fails = []; @@ -25,7 +25,9 @@ const LRM = '‎'; function klient(svar) { const hj = lavFalskHjaelper('cmcp-bundet'); hj.saetSvar(svar); + // Ingen aegte dialog kan komme fra denne proeve: osascript er en attrap (claims 26). const env = { ...process.env, CMCP_MODE: 'allow', CMCP_HELPER: hj.sti, + CMCP_OSASCRIPT: lavFalskSpoerger('udloeb', 'cmcp-bundet-sp').sti, CMCP_STATE_DIR: mkdtempSync(join(tmpdir(), 'cmcp-bundet-')) }; delete env.CMCP_BACKGROUND; // standarden: baggrund const srv = spawn('node', [join(ROOT, 'mcp-server', 'index.js')], { env, stdio: ['pipe', 'pipe', 'pipe'] }); diff --git a/test/claims.mjs b/test/claims.mjs index 619fa8cc..1f587776 100644 --- a/test/claims.mjs +++ b/test/claims.mjs @@ -90,7 +90,7 @@ function client(env) { // ⛔ Og hullet det ville aabne, er lukket det rigtige sted: `release.sh` // NAEGTER at udgive uden CMCP_DIALOGS=1. Saa kan samtykke-porten ikke // vaere ubevist naar noget gaar ud, uanset hvor tit jeg glemmer flaget. -import { lavFalskSpoerger, FREMMED_MASKINE, OPTAG_GRUND, lavFalskHjaelper as lavStandardAttrap } from './falsk-hjaelper.mjs'; +import { lavFalskSpoerger, FREMMED_MASKINE, OPTAG_GRUND, lavFalskHjaelper as lavStandardAttrap, lavVagtHjaelper } from './falsk-hjaelper.mjs'; // ⛔ 24/9 (Fable, runde 2): 13 klienter koerte mod den AEGTE hjaelper, og paastand // 1b flyttede Gustavs rigtige markoer til (900,500) ved hver koersel. Nu gaar // OPSLAG til den aegte hjaelper (svarene er sande), HANDLINGER sluges og noteres. @@ -421,7 +421,15 @@ esac // revisionslinjen skal baere det kanoniske bundle-ID. Goer den ikke det, // saa det porten saa, var navnet. if (probe && probe.name !== probe.bundleId) { - const c = client({ CMCP_MODE: 'readonly' }); + // ⛔ 9/10: i readonly afvises et skrivende kald FOER opslaget (431c159, panel R8 J), + // saa loggen fik target null, og 6e var roed paa en rigtig regel. Standardtilstanden + // slaar programmet op; tryk-toerkoerslen finder intet element med denne titel og + // afviser, saa intet trykkes. Porten slaar programmet op gennem HJAELPEREN (0.2.2, + // bundet maal), saa standard-attrappen - der ikke kender menneskets programmer - + // gav ogsaa null. Vagt-hjaelperen lader opslag gaa til den aegte og stopper alle + // handlinger. + const vagt6e = lavVagtHjaelper(HELPER, 'cmcp-claims-6e'); + const c = client({ CMCP_MODE: 'allow', CMCP_HELPER: vagt6e.sti }); await c.ready(); await c.rpc('tools/call', { name: 'computer_press', arguments: { app: probe.name, title: 'FINDES-IKKE-6e' } }); c.srv.kill(); diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 7d34b0af..a88ae077 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -233,5 +233,19 @@ check('5p stopknappen slaas aldrig fra - hverken af pausen eller af Touch ID-ark check('5q boksen ligger paa statuslinjens lag, ikke det almindelige svaevelag (isFloatingPanel nulstiller level - maalt R22, Opus)', /isFloatingPanel = true\n\s+level = \.statusBar/.test(m) && !/level = \.statusBar\n\s+isFloatingPanel = true/.test(m)); +// 8 · agentens egne tekster peger paa boksen (R22: 0 af 2 svar i menulinjen 9/10, 2 af 2 i boksen) +const vaerktoejer = readFileSync(join(ROOT, 'mcp-server', 'tools.js'), 'utf8'); +const beskrivelse = (navn) => { const i = vaerktoejer.indexOf(`name: '${navn}'`); const d = vaerktoejer.indexOf("description: '", i); return i < 0 || d < 0 ? '' : vaerktoejer.slice(d, vaerktoejer.indexOf("',\n", d)); }; +const laanTekst = beskrivelse('computer_request_screen'), spoergTekst = beskrivelse('computer_ask_user'); +check('8a computer_request_screen beder agenten sende mennesket til boksen paa deres skaerm, og naevner stopknappen der', + /Allow \(Touch ID\) in the Computer MCP box in the top-right corner of the screen they are using/.test(laanTekst) + && /Take the screen back now/.test(laanTekst) && !/click the orange icon in the menu bar, then Allow/.test(laanTekst), laanTekst.slice(150, 420)); +check('8b computer_ask_user: spoergsmaalet venter i boksen (og under menulinje-ikonet)', + /waits in the Computer MCP box in the top-right corner of their screen/.test(spoergTekst), spoergTekst.slice(380, 560)); +const idx = readFileSync(join(ROOT, 'mcp-server', 'index.js'), 'utf8'); +check('8c serverens egne vejledninger naevner boksen, ikke kun menulinjen', + /they approve it in the box in the corner of their screen/.test(idx) && /The question then waits in the box in the corner of their screen/.test(idx) + && /In\nbackground mode it waits in the Computer MCP box in the corner of their screen/.test(idx)); + console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From 0e96676fe82ed877ef64369d61476f8c6449a3f3 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 21:00:08 +0200 Subject: [PATCH 115/132] skrivevagt: macOS' adgangskodesignal som ekstra nej i type og paste (R23) En browser taender Secure Event Input for et kodeordsfelt, ogsaa naar tilgaengeligheds-laget kun ser siden omkring det (AXWebArea, som vagten regnede for ikke-sikker). Maalt roed foer rettelsen: med signalet taendt skrev type 12 tegn i et almindeligt felt, baade via AX og som tastetryk. Nu: Skrivevagt.swift (ren funktion) afgoer for type - foer AX-vejen og foer hvert tegn - og for paste, der slet intet feltvaern havde (Astra). Signalet er kun et nej; et ukendt fokus bliver aldrig et ja. skriv-ankommer 5, 5k, 6a-6d groenne; mutanter K1-K6 roede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 72 +++++++++++++++++++++ CHANGELOG.md | 7 ++ README.md | 6 +- helper/Sources/cmcp-helper/Input.swift | 4 ++ helper/Sources/cmcp-helper/Skrivevagt.swift | 20 ++++++ helper/Sources/cmcp-helper/main.swift | 24 ++++++- mcp-server/README.md | 6 +- test/fixture/proevemaal.swift | 5 ++ test/skriv-ankommer.mjs | 38 +++++++++++ 9 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 helper/Sources/cmcp-helper/Skrivevagt.swift diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 9640a5b7..9c02e90b 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2462,5 +2462,77 @@ ], "proeve": "test/claims.mjs", "forventet": "6e" + }, + { + "navn": "K1-signalet-ignoreres", + "fil": "helper/Sources/cmcp-helper/Skrivevagt.swift", + "par": [ + [ + " if sikkerIndtastning { return .sikkertFelt }\n", + "" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6a" + }, + { + "navn": "K2-ukendt-fokus-bliver-ja", + "fil": "helper/Sources/cmcp-helper/Skrivevagt.swift", + "par": [ + [ + " guard let s = fokusSikkert else { return .ukendtFokus }\n", + " guard let s = fokusSikkert else { return .maa }\n" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6a" + }, + { + "navn": "K3-type-uden-signal-foerst", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if skriveDom(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt {\n", + " if false {\n" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6b" + }, + { + "navn": "K4-paste-uden-signal", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " sikkerIndtastning: macosSikkerIndtastning()) {\n case .maa: break\n", + " sikkerIndtastning: false) {\n case .maa: break\n" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6c" + }, + { + "navn": "K5-paste-ukendt-fokus-tilladt", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " case .ukendtFokus:\n Out.fail(\"could not see where the keyboard focus is, so a password field cannot be ruled out; nothing was pasted.", + " case .ukendtFokus: break\n case .maa where false:\n Out.fail(\"could not see where the keyboard focus is, so a password field cannot be ruled out; nothing was pasted." + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6c" + }, + { + "navn": "K6-signalet-er-ikke-macos", + "fil": "helper/Sources/cmcp-helper/Input.swift", + "par": [ + [ + "func macosSikkerIndtastning() -> Bool { IsSecureEventInputEnabled() }", + "func macosSikkerIndtastning() -> Bool { false }" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6d" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index c925cfdb..bad0013d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,13 @@ turns orange and shows the whole question - who, what, where it lands and how long a yes counts - with the menu's own buttons: `Allow (Touch ID)` and `Deny`; the buttons wait a second after a new question appears. Allowing still asks for Touch ID every time; for a question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) +**macOS's own password signal stops typing and pasting.** A browser switches on +macOS's secure input for a password field, also when the accessibility layer only +sees the page around it. While it is on, `computer_type` types nothing - not +through the accessibility layer and not as key presses - and `computer_paste`, +which had no field check at all, now judges the field in front like `type` does: +an unknown focus or a password field is refused. The signal only ever adds a no. +(`test/skriv-ankommer.mjs` 5, 5k, 6a-6d) **The screen loan is in the box, with its stop button.** While an agent has your screen, the box says who and how many minutes are left, with `Take the screen back now` first - also while the agent is quiet and also when the box is switched off. diff --git a/README.md b/README.md index 2752fa6e..dccdb27f 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,11 @@ check on purpose once: the modified build wrote into the password box. It is the only thing standing there. `computer_type` refuses the same way, and checks before every character: when a Tab, a click or the page itself moves the focus into a password field halfway -through, the typing stops there. +through, the typing stops there. It also listens to macOS's own password signal +(secure input), which a browser switches on for a password field even when the +accessibility layer only sees the page around it: while it is on, nothing is typed +anywhere. The signal can only add a no - it never turns an unknown field into a +yes. `computer_paste` judges the field in front the same way before it pastes. **`computer_wait_for`** waits for an element to appear instead of taking screenshots in a loop. Twenty polls cost one call here and twenty images the diff --git a/helper/Sources/cmcp-helper/Input.swift b/helper/Sources/cmcp-helper/Input.swift index c5ba9cfb..bddff387 100644 --- a/helper/Sources/cmcp-helper/Input.swift +++ b/helper/Sources/cmcp-helper/Input.swift @@ -1,4 +1,5 @@ import AppKit +import Carbon import CoreGraphics import Foundation @@ -192,3 +193,6 @@ enum Input { return true } } + +/// macOS' adgangskodesignal (Secure Event Input) lige nu - se Skrivevagt.swift. +func macosSikkerIndtastning() -> Bool { IsSecureEventInputEnabled() } diff --git a/helper/Sources/cmcp-helper/Skrivevagt.swift b/helper/Sources/cmcp-helper/Skrivevagt.swift new file mode 100644 index 00000000..0ce390ab --- /dev/null +++ b/helper/Sources/cmcp-helper/Skrivevagt.swift @@ -0,0 +1,20 @@ +import Foundation + +// Maa agenten skrive - taste eller indsaette - i det felt der har fokus? (R23) +// Egen fil, saa test/skriv-ankommer.mjs kan kompilere afgoerelsen for sig. +// +// ⛔ R23 (Opus, Astra): macOS' eget adgangskodesignal (Secure Event Input) taendes af +// en browser for et kodeordsfelt - ogsaa naar tilgaengeligheds-laget kun ser en +// beholder (AXWebArea) og derfor siger «ikke sikkert». Signalet er kun et EKSTRA +// NEJ: det er globalt (et kodeordsfelt i ethvert program taender det) og slukket, +// naar browseren ikke er forrest. Det kan aldrig goere et ukendt fokus til et ja. + +enum SkriveDom: Equatable { case maa, ukendtFokus, sikkertFelt } + +/// `fokusSikkert`: tilgaengeligheds-lagets svar (nil = ukendt). +/// `sikkerIndtastning`: macOS' adgangskodesignal lige nu. +func skriveDom(fokusSikkert: Bool?, sikkerIndtastning: Bool) -> SkriveDom { + if sikkerIndtastning { return .sikkertFelt } + guard let s = fokusSikkert else { return .ukendtFokus } + return s ? .sikkertFelt : .maa +} diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 4d941976..2be886f0 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -352,6 +352,16 @@ case "paste": var ind = "" while let l = readLine(strippingNewline: false) { ind += l } if ind.isEmpty { Out.fail("no text on stdin", code: "bad-args") } + // ⛔ R23 (Astra): indsaet havde intet feltvaern - samme regel som `type`. Cmd+V lander + // i det forreste programs fokus, saa det er DET felt der doemmes. + switch skriveDom(fokusSikkert: AX.fokusErSikkert(pid: NSWorkspace.shared.frontmostApplication?.processIdentifier), + sikkerIndtastning: macosSikkerIndtastning()) { + case .maa: break + case .ukendtFokus: + Out.fail("could not see where the keyboard focus is, so a password field cannot be ruled out; nothing was pasted. Use computer_find + computer_set_value, or ask the person.", code: "focus-unknown") + case .sikkertFelt: + Out.fail("the keyboard focus is in a password field - we do not paste into password fields; nothing was pasted. Ask the person to type it themselves with computer_ask_user.", code: "secure-field") + } let r = AX.pasteText(ind, restore: !args.flag("no-restore")) if !r.ok { Out.fail(r.why, code: AX.pasteStop ? "screen-taken-back" : "paste-failed") } Out.ok(["pasted": true, "chars": ind.count, "restored": r.restored, "note": r.why]) @@ -883,6 +893,12 @@ case "type": Out.fail("--text or --stdin is missing", code: "bad-args") } let skrivPid = modtager(args) + // ⛔ R23: macOS' adgangskodesignal er taendt - et kodeordsfelt har fokus et sted. + // Intet skrives, hverken gennem tilgaengeligheds-laget eller som tastetryk. + if skriveDom(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt { + Out.fail("a password field has the keyboard focus (macOS secure input is on) - we do not type into password fields. Ask the person to type it themselves with computer_ask_user.", + code: "secure-field", extra: ["typed": 0, "did": [] as [String]]) + } // Med et navngivet program: skriv først direkte i det felt, programmet selv har // fokus på, og læs det tilbage. Tager feltet ikke imod den vej, sendes tastetryk // som før - og så siger svaret, at ankomsten ikke er efterprøvet (P2, 27/9). @@ -902,9 +918,11 @@ case "type": var ukendtFokus = false let skrivMaal = Skaerm.maalt(tilPid: skrivPid) { sendtTegn = Input.type(typeText, cps: args.int("cps") ?? 240, tilPid: skrivPid) { - guard let sikker = AX.fokusErSikkert(pid: skrivPid) else { ukendtFokus = true; return true } - ramteSikkert = sikker - return ramteSikkert + switch skriveDom(fokusSikkert: AX.fokusErSikkert(pid: skrivPid), sikkerIndtastning: macosSikkerIndtastning()) { + case .maa: return false + case .ukendtFokus: ukendtFokus = true; return true + case .sikkertFelt: ramteSikkert = true; return true + } } } if ukendtFokus { diff --git a/mcp-server/README.md b/mcp-server/README.md index eaa401e0..d8fe64cd 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -277,7 +277,11 @@ check on purpose once: the modified build wrote into the password box. It is the only thing standing there. `computer_type` refuses the same way, and checks before every character: when a Tab, a click or the page itself moves the focus into a password field halfway -through, the typing stops there. +through, the typing stops there. It also listens to macOS's own password signal +(secure input), which a browser switches on for a password field even when the +accessibility layer only sees the page around it: while it is on, nothing is typed +anywhere. The signal can only add a no - it never turns an unknown field into a +yes. `computer_paste` judges the field in front the same way before it pastes. **`computer_wait_for`** waits for an element to appear instead of taking screenshots in a loop. Twenty polls cost one call here and twenty images the diff --git a/test/fixture/proevemaal.swift b/test/fixture/proevemaal.swift index 98be19a9..891e6bb2 100644 --- a/test/fixture/proevemaal.swift +++ b/test/fixture/proevemaal.swift @@ -6,6 +6,7 @@ // // Vinduet placeres UDEN FOR enhver skaerm, saa intet kan ses. import AppKit +import Carbon /// Et vindue uden titellinje kan som standard ikke blive noeglevindue, og /// saa naar tastetryk aldrig feltet. Proeverne skal kunne taste i det. @@ -124,6 +125,10 @@ final class App: NSObject, NSApplicationDelegate { foerste = sikker } vindue.orderFront(nil) // frem, men IKKE makeKey - vi stjaeler ingen fokus + // macOS' eget adgangskodesignal (Secure Event Input), som en browser taender det + // for et kodeordsfelt (R23). Det almindelige felt beholder fokus, saa KUN signalet + // kan stoppe skrivningen. Signalet slukkes naar processen doer. + if ProcessInfo.processInfo.environment["CMCP_PROEVE_SEI"] == "1" { EnableSecureEventInput() } // Feltet har fokus INDE I appen. Det er den tilstand et rigtigt // program er i: noget er valgt, selv naar vinduet ikke er forrest. // En «samtale» som i en beskedapp (30/9, runde 1 Fable P4): en sidebar med et diff --git a/test/skriv-ankommer.mjs b/test/skriv-ankommer.mjs index 9a220841..891c3b16 100644 --- a/test/skriv-ankommer.mjs +++ b/test/skriv-ankommer.mjs @@ -102,9 +102,47 @@ try { check('4 samtalen: modtageren er navnet over feltet, ikke sidebarens', (s4.headings || [])[0] === 'Bob Samtale' && !(s4.headings || []).includes('Alice Sidebar') && s4.column === true, JSON.stringify(s4).slice(0, 200)); check('4b ...og teksten er feltets', s4.field?.value === 'hej Bob', JSON.stringify(s4.field || {})); + + // 5. macOS' eget adgangskodesignal (Secure Event Input, R23 - Opus): en browser + // taender det for et kodeordsfelt, ogsaa naar tilgaengeligheds-laget kun ser en + // beholder (AXWebArea). Er det taendt, skrives der INTET - heller ikke i et + // almindeligt felt. Signalet er kun et ekstra NEJ, aldrig et ja. + const sei = await start({ CMCP_PROEVE_SEI: '1' }); + const seiProces = boern[boern.length - 1]; + const r5 = koer('type', '--app', sei, '--text', 'hemmelig-sei'); + check('5 macOS-adgangskodesignalet taendt: ingen tekst, heller ikke i et almindeligt felt', nej(r5) && !feltet(sei).includes('hemmelig'), JSON.stringify(r5).slice(0, 160)); + const r5k = koer('type', '--app', sei, '--keystrokes', '--text', 'hemmelig-sei'); + check('5k ...heller ikke som tastetryk', nej(r5k) && !feltet(sei).includes('hemmelig'), JSON.stringify(r5k).slice(0, 160)); + try { seiProces.kill(); } catch {} // signalet slukkes med processen - straks } finally { for (const b of boern) { try { b.kill(); } catch {} } rmSync(ARB, { recursive: true, force: true }); } +// 6. Afgoerelsen for sig (Skrivevagt.swift kompileret alene) og bundet til begge skriveveje. +{ + const { readFileSync, writeFileSync } = await import('node:fs'); + const KILDE = join(ROOT, 'helper', 'Sources', 'cmcp-helper'); + const A6 = mkdtempSync(join(tmpdir(), 'cmcp-skrivevagt-')); + writeFileSync(join(A6, 'main.swift'), `import Foundation +let tilf: [(Bool?, Bool)] = [(false, false), (true, false), (nil, false), (false, true), (true, true), (nil, true)] +print(tilf.map { t -> String in switch skriveDom(fokusSikkert: t.0, sikkerIndtastning: t.1) { case .maa: return "maa"; case .ukendtFokus: return "ukendt"; case .sikkertFelt: return "sikker" } }.joined(separator: ",")) +`); + execFileSync('swiftc', ['-O', join(KILDE, 'Skrivevagt.swift'), join(A6, 'main.swift'), '-o', join(A6, 'v')], { stdio: 'pipe', timeout: 300000 }); + const dom = execFileSync(join(A6, 'v'), { encoding: 'utf8' }).trim(); + rmSync(A6, { recursive: true, force: true }); + check('6a afgoerelsen: kun et kendt, almindeligt felt uden adgangskodesignal maa skrives i; signalet er et nej, aldrig et ja', + dom === 'maa,sikker,ukendt,sikker,sikker,sikker', dom); + const m = readFileSync(join(KILDE, 'main.swift'), 'utf8'); + const typeKrop = m.slice(m.indexOf('let skrivPid = modtager(args)'), m.indexOf('if ukendtFokus {')); + check('6b type: signalet doemmes FOER tilgaengeligheds-vejen, og hvert tegn gaar gennem skriveDom', + typeKrop.indexOf('sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt') > 0 + && typeKrop.indexOf('sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt') < typeKrop.indexOf('AX.indsaetIFokus(') + && /switch skriveDom\(fokusSikkert: AX\.fokusErSikkert\(pid: skrivPid\), sikkerIndtastning: macosSikkerIndtastning\(\)\) \{\n\s+case \.maa: return false\n\s+case \.ukendtFokus: ukendtFokus = true; return true\n\s+case \.sikkertFelt: ramteSikkert = true; return true/.test(typeKrop), typeKrop.slice(0, 120)); + const pasteKrop = m.slice(m.indexOf('case "paste":'), m.indexOf('case "window-set":')); + check('6c paste (R23, Astra): det forreste felt doemmes af samme skriveDom FOER Cmd+V - ukendt og kodeord afvises', + /switch skriveDom\(fokusSikkert: AX\.fokusErSikkert\(pid: NSWorkspace\.shared\.frontmostApplication\?\.processIdentifier\),\n\s+sikkerIndtastning: macosSikkerIndtastning\(\)\) \{\n\s+case \.maa: break\n\s+case \.ukendtFokus:\n\s+Out\.fail\([^\n]*code: "focus-unknown"\)\n\s+case \.sikkertFelt:\n\s+Out\.fail\([^\n]*code: "secure-field"\)/.test(pasteKrop) + && pasteKrop.indexOf('switch skriveDom(') < pasteKrop.indexOf('AX.pasteText('), pasteKrop.slice(0, 160)); + check('6d signalet er macOS\' eget (IsSecureEventInputEnabled)', /func macosSikkerIndtastning\(\) -> Bool \{ IsSecureEventInputEnabled\(\) \}/.test(readFileSync(join(KILDE, 'Input.swift'), 'utf8'))); +} console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); process.exit(fails.length ? 1 : 0); From 1166640b5bf988a3c7dc1905993fc84452de8764 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 21:08:59 +0200 Subject: [PATCH 116/132] find: et tidsudloeb siges, og intet vaelges af sig selv bagefter (R23) Maalt roed foer rettelsen: med CMCP_BUDGET_SEK=0 svarede find {count: 0} som for et tomt program, og set_value/press valgte et enkelt fund, selv om et andet, ens felt kunne ligge i den del soegningen ikke naaede (Astra). Nu baerer find stopped_early, og vaelgTraef afviser med search-incomplete uden et udtrykkeligt index. Serverens tryk-toerkoersel bruger samme valg og afviser derfor ogsaa uden at spoerge. skriv-ankommer 7-7d; vaelger, knap-ord, klik-ejer, bundet-maal, stille-vej, claims groenne; mutanter F1-F2 roede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 24 ++++++++++++++++++++++++ CHANGELOG.md | 7 +++++++ helper/Sources/cmcp-helper/main.swift | 14 +++++++++++++- test/skriv-ankommer.mjs | 17 +++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 9c02e90b..b1a4d91e 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2534,5 +2534,29 @@ ], "proeve": "test/skriv-ankommer.mjs", "forventet": "6d" + }, + { + "navn": "F1-tidsudloeb-vaelger-alligevel", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if AX.stoppedeTidligt && args.int(\"index\") == nil {\n Out.fail(\"the search stopped", + " if false {\n Out.fail(\"the search stopped" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "7c" + }, + { + "navn": "F2-find-tier-om-tidsudloeb", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " fundSvar[\"stopped_early\"] = true\n", + "" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "7d" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index bad0013d..59a6b555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,13 @@ turns orange and shows the whole question - who, what, where it lands and how long a yes counts - with the menu's own buttons: `Allow (Touch ID)` and `Deny`; the buttons wait a second after a new question appears. Allowing still asks for Touch ID every time; for a question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) +**A search that ran out of time no longer picks for you.** When an app answers so +slowly that `computer_find` stops before it has seen the whole app, the answer now +says `stopped_early` - before, it looked exactly like an empty app. And +`computer_set_value` and `computer_press` will not pick the one match they found +after such a search, because a second, identical field may be in the part they did +not reach: they refuse with `search-incomplete` unless you pass an `index`. +(`test/skriv-ankommer.mjs` 7-7d) **macOS's own password signal stops typing and pasting.** A browser switches on macOS's secure input for a password field, also when the accessibility layer only sees the page around it. While it is on, `computer_type` types nothing - not diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 2be886f0..66c7bff2 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -79,6 +79,12 @@ func denySet(_ a: Args) -> Set { /// Vælg ét træf. --index N er nummeret i den liste, find (og en tvetydig fejl) viste. /// Uden --index: præcis ét træf, eller --first når kaldet må gætte (press). func vaelgTraef(_ hits: [AX.Match], _ args: Args, maaGaette: Bool) -> AX.Match { + // ⛔ R23 (Astra, maalt): en soegning der loeb toer for tid har maaske ikke set et + // andet, ens element - og et enkelt fund blev skrevet i. Saa vaelges intet af sig selv. + if AX.stoppedeTidligt && args.int("index") == nil { + Out.fail("the search stopped after \(Int(AX.tidsgraense)) seconds before it had seen the whole app, so another matching element cannot be ruled out - nothing was done. Narrow the search (role, subrole, title or a lower depth), or pick one with index from computer_find.", + code: "search-incomplete", extra: ["matches": hits.map(\.dict), "count": hits.count, "stopped_early": true]) + } if let i = args.int("index") { guard i >= 0, i < hits.count else { Out.fail("there is no match number \(i); there are \(hits.count)", code: "not-found", @@ -499,7 +505,13 @@ case "find": limit: args.int("limit") ?? 25, ekstraDeny: denySet(args) ) - Out.ok(["matches": hits.map(\.dict), "count": hits.count]) + var fundSvar: [String: Any] = ["matches": hits.map(\.dict), "count": hits.count] + // ⛔ R23 (Astra): et tidsudloeb lignede et tomt program ({count: 0}). Nu siges det. + if AX.stoppedeTidligt { + fundSvar["stopped_early"] = true + fundSvar["note"] = "The search stopped after \(Int(AX.tidsgraense)) seconds - this app answers slowly, so these are the matches in PART of it, not all. Narrow it with role, subrole, title or a lower depth." + } + Out.ok(fundSvar) case "set-value": // Et flag hjaelperen ikke kender, maa ikke ignoreres i stilhed: --subrole blev diff --git a/test/skriv-ankommer.mjs b/test/skriv-ankommer.mjs index 891c3b16..45b3b6ce 100644 --- a/test/skriv-ankommer.mjs +++ b/test/skriv-ankommer.mjs @@ -114,6 +114,18 @@ try { const r5k = koer('type', '--app', sei, '--keystrokes', '--text', 'hemmelig-sei'); check('5k ...heller ikke som tastetryk', nej(r5k) && !feltet(sei).includes('hemmelig'), JSON.stringify(r5k).slice(0, 160)); try { seiProces.kill(); } catch {} // signalet slukkes med processen - straks + + // 7. En soegning der loeb toer for tid (R23, Astra): `find` svarede {count: 0} som for + // et tomt trae, og et enkelt fund blev skrevet i, selv om et andet, ens felt ikke var + // set. Nu siger `find` det, og set_value vaelger intet af sig selv efter tidsudloeb. + const tid = await start({ CMCP_PROEVE_VAELGER: '1' }); + const nul = (...a) => { try { return JSON.parse(execFileSync(HJAELPER, a, { encoding: 'utf8', timeout: 60000, env: { ...process.env, CMCP_BUDGET_SEK: '0' } })); } + catch (e) { try { return JSON.parse(String(e.stdout)); } catch { return { ok: false, error: String(e.stdout || e.message).slice(0, 200) }; } } }; + const r7 = nul('set-value', '--app', tid, '--role', 'AXTextField', '--text', 'tidsudloeb'); + check('7 set_value efter en soegning der loeb toer for tid: intet skrives, og svaret siger hvorfor', + r7.ok === false && r7.code === 'search-incomplete' && r7.stopped_early === true && !feltet(tid).includes('tidsudloeb'), JSON.stringify(r7).slice(0, 180)); + const f7 = nul('find', '--app', tid, '--role', 'AXTextField'); + check('7b find siger at svaret er ufuldstaendigt (stopped_early) i stedet for at ligne et tomt program', f7.ok === true && f7.stopped_early === true, JSON.stringify(f7).slice(0, 180)); } finally { for (const b of boern) { try { b.kill(); } catch {} } rmSync(ARB, { recursive: true, force: true }); @@ -142,6 +154,11 @@ print(tilf.map { t -> String in switch skriveDom(fokusSikkert: t.0, sikkerIndtas check('6c paste (R23, Astra): det forreste felt doemmes af samme skriveDom FOER Cmd+V - ukendt og kodeord afvises', /switch skriveDom\(fokusSikkert: AX\.fokusErSikkert\(pid: NSWorkspace\.shared\.frontmostApplication\?\.processIdentifier\),\n\s+sikkerIndtastning: macosSikkerIndtastning\(\)\) \{\n\s+case \.maa: break\n\s+case \.ukendtFokus:\n\s+Out\.fail\([^\n]*code: "focus-unknown"\)\n\s+case \.sikkertFelt:\n\s+Out\.fail\([^\n]*code: "secure-field"\)/.test(pasteKrop) && pasteKrop.indexOf('switch skriveDom(') < pasteKrop.indexOf('AX.pasteText('), pasteKrop.slice(0, 160)); + const vaelg = m.slice(m.indexOf('func vaelgTraef('), m.indexOf('return first', m.indexOf('func vaelgTraef('))); + check('7c vaelgTraef: efter tidsudloeb vaelges intet uden et udtrykkeligt index - foer alt andet', + /func vaelgTraef\([^\n]*\n(\s+\/\/[^\n]*\n)*\s+if AX\.stoppedeTidligt && args\.int\("index"\) == nil \{\n\s+Out\.fail\([^\n]*\n\s+code: "search-incomplete"/.test(vaelg), vaelg.slice(0, 200)); + check('7d find-svaret baerer stopped_early, naar soegningen loeb toer for tid', + /if AX\.stoppedeTidligt \{\n\s+fundSvar\["stopped_early"\] = true/.test(m) && /Out\.ok\(fundSvar\)/.test(m)); check('6d signalet er macOS\' eget (IsSecureEventInputEnabled)', /func macosSikkerIndtastning\(\) -> Bool \{ IsSecureEventInputEnabled\(\) \}/.test(readFileSync(join(KILDE, 'Input.swift'), 'utf8'))); } console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); From b527115d742dc79509979d1f5da75fe60fd1d01a Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 21:12:44 +0200 Subject: [PATCH 117/132] README: aerlig om Chrome-sider og sloering af kodeordsfelter i dem (R23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gate 1 sloerer et kodeordsfelt i en webside kun, naar browseren viser siden for tilgaengeligheds-laget - Chrome goer det paa nogle Mac'er og ikke paa andre (Opus maalte 861 noder 9/10; 23/9 var det nul). Graensen «ser ikke ind i websider» siger nu det samme og daterer begge maalinger. Co-Authored-By: Claude Opus 5.5 --- README.md | 12 +++++++++--- mcp-server/README.md | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dccdb27f..e0be7953 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,11 @@ written. There is no moment where an unredacted picture of your desktop exists as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box -through - so both are checked. +through - so both are checked. In a web page the box is only found when the +browser shows its page to the accessibility layer, and Chrome does that on some +Macs and not on others (see the limits below). Where it does not, the field is not +painted over; what it shows is the browser's own dots, unless the page itself +shows the password in plain text. **2. The dangerous places ask first.** By default the agent works without interrupting you - that is what lets it run while you do something else - and @@ -447,8 +451,10 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. bar. Chrome builds that tree for a real screen reader, not for the switch Electron apps honour. Apps built on Electron - VS Code, Slack, Notion, the IDE this was measured in - do expose their content: 4.000 nodes, 1.434 texts, - 267 buttons in one window. So: inside a web page, use a browser tool; inside - an app, use this one. They do not overlap. + 267 buttons in one window. On 9 Oct a Chrome on another Mac did show a page + (861 nodes on one page): whether it does depends on a setting Google switches + per machine, not on anything this server does. Until that is measured and + built on, treat a web page as a browser tool's job and an app as this one's. - **Keystrokes do not land in a Chromium window that is not focused.** Measured the same day: the helper reported `typed: 21` and `took_screen: false`, and the text arrived nowhere. `computer_set_value` through the accessibility diff --git a/mcp-server/README.md b/mcp-server/README.md index d8fe64cd..07724dd6 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -76,7 +76,11 @@ written. There is no moment where an unredacted picture of your desktop exists as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box -through - so both are checked. +through - so both are checked. In a web page the box is only found when the +browser shows its page to the accessibility layer, and Chrome does that on some +Macs and not on others (see the limits below). Where it does not, the field is not +painted over; what it shows is the browser's own dots, unless the page itself +shows the password in plain text. **2. The dangerous places ask first.** By default the agent works without interrupting you - that is what lets it run while you do something else - and @@ -445,8 +449,10 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. bar. Chrome builds that tree for a real screen reader, not for the switch Electron apps honour. Apps built on Electron - VS Code, Slack, Notion, the IDE this was measured in - do expose their content: 4.000 nodes, 1.434 texts, - 267 buttons in one window. So: inside a web page, use a browser tool; inside - an app, use this one. They do not overlap. + 267 buttons in one window. On 9 Oct a Chrome on another Mac did show a page + (861 nodes on one page): whether it does depends on a setting Google switches + per machine, not on anything this server does. Until that is measured and + built on, treat a web page as a browser tool's job and an app as this one's. - **Keystrokes do not land in a Chromium window that is not focused.** Measured the same day: the helper reported `typed: 21` and `took_screen: false`, and the text arrived nowhere. `computer_set_value` through the accessibility From 8cc7c3b337d50e1d2a4ec0e95d004e7b9808278a Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 21:33:38 +0200 Subject: [PATCH 118/132] boks: stopknap i egen raekke, Follow under laan, synlighed og lag proevet paa adfaerd (R24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R24 (Astra + Opus, MAALT): under et laan + et goer-selv-spoergsmaal var knapraekken 465 af 336 px - «Done» og «I won't do this» faldt ud. Stop- knappen har nu sin egen raekke. Follow og vaelgeren afgoeres af «intet spoergsmaal» i stedet for orange (et laan er orange, og valget blev aldrig opdateret). Synligheden er boksSynlig (ren funktion) og panelets opsaetning boksPanelOpsaetning, som proeven koerer paa et rigtigt panel og maaler lag 25 - de to mutanter der overlevede 5n/5q (level=.floating bagefter, boks- fra-return) rammes nu. ikon-boks 5r-5x; alle 40 boks-mutanter roede (T4/T8/X7 flyttet, T9-T11 nye). Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 56 +++++++++++++++++++++----- helper/Sources/cmcp-status/Tekst.swift | 26 ++++++++++++ helper/Sources/cmcp-status/main.swift | 36 +++++++---------- test/ikon-boks.mjs | 35 +++++++++++++--- 4 files changed, 116 insertions(+), 37 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index b1a4d91e..9a80fbb4 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -1817,11 +1817,11 @@ }, { "navn": "X7-boksen-i-skaermbilleder", - "fil": "helper/Sources/cmcp-status/main.swift", + "fil": "helper/Sources/cmcp-status/Tekst.swift", "par": [ [ - " sharingType = .none\n", - "" + " p.sharingType = .none\n", + " p.sharingType = .readOnly\n" ] ], "proeve": "test/ikon-boks.mjs", @@ -2396,12 +2396,12 @@ "fil": "helper/Sources/cmcp-status/main.swift", "par": [ [ - " if laan == nil && (s.isEmpty || boksSlaaetFra || !arbejder) {\n", - " if (s.isEmpty || boksSlaaetFra || !arbejder) {\n" + "slaaetFra: boksSlaaetFra, arbejder: arbejder) {\n", + "slaaetFra: boksSlaaetFra, arbejder: arbejder) && laan == nil {\n" ] ], "proeve": "test/ikon-boks.mjs", - "forventet": "5n" + "forventet": "5s" }, { "navn": "T5-laanet-ikke-i-boksen", @@ -2441,15 +2441,15 @@ }, { "navn": "T8-boksen-paa-svaevelaget", - "fil": "helper/Sources/cmcp-status/main.swift", + "fil": "helper/Sources/cmcp-status/Tekst.swift", "par": [ [ - " isFloatingPanel = true\n level = .statusBar\n", - " level = .statusBar\n isFloatingPanel = true\n" + " p.isFloatingPanel = true\n p.level = .statusBar\n", + " p.level = .statusBar\n p.isFloatingPanel = true\n" ] ], "proeve": "test/ikon-boks.mjs", - "forventet": "5q" + "forventet": "5t" }, { "navn": "C6e-porten-ser-navnet-ikke-id", @@ -2558,5 +2558,41 @@ ], "proeve": "test/skriv-ankommer.mjs", "forventet": "7d" + }, + { + "navn": "T9-synlig-uden-laan", + "fil": "helper/Sources/cmcp-status/Tekst.swift", + "par": [ + [ + " laan || (sessioner > 0 && !slaaetFra && arbejder)\n", + " sessioner > 0 && !slaaetFra && arbejder\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5r" + }, + { + "navn": "T10-stopknap-i-samme-raekke", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if k == TAG_TILBAGE { stopRaekke.addArrangedSubview(b) } else { knapper.addArrangedSubview(b) }\n", + " knapper.addArrangedSubview(b)\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5v" + }, + { + "navn": "T11-follow-afgjort-af-orange", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if ny == nil && sessioner.count > 1 {\n", + " if !ind.orange && sessioner.count > 1 {\n" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5w" } ] diff --git a/helper/Sources/cmcp-status/Tekst.swift b/helper/Sources/cmcp-status/Tekst.swift index a4ec5744..dff73a44 100644 --- a/helper/Sources/cmcp-status/Tekst.swift +++ b/helper/Sources/cmcp-status/Tekst.swift @@ -1,3 +1,4 @@ +import AppKit import Foundation import CoreGraphics @@ -116,6 +117,31 @@ private func boksIndholdUdenLaan(arbejder: [(navn: String, maal: String?, nu: St return BoksIndhold(titel: titel, orange: false, linjer: linjer, knapper: arbejder.isEmpty ? [] : ["Follow"]) } +/// Skal boksen staa fremme? (R24, ren funktion - tik() afgoer det kun her.) +/// Et aktivt skaerm-laan holder den fremme uanset alt: stopknappen skal kunne ses. +/// Ellers kun naar der er sessioner, boksen ikke er slaaet fra, og nogen arbejder +/// (eller har gjort det inden for et halvt minut, eller et spoergsmaal venter). +func boksSynlig(laan: Bool, sessioner: Int, slaaetFra: Bool, arbejder: Bool) -> Bool { + laan || (sessioner > 0 && !slaaetFra && arbejder) +} + +/// Boksens panel-opsaetning (R24): laget saettes EFTER isFloatingPanel, som ellers +/// nulstiller det til det almindelige svaevelag (3) - maalt R22 og R24 (Opus). +func boksPanelOpsaetning(_ p: NSPanel) { + p.isFloatingPanel = true + p.level = .statusBar + p.becomesKeyOnlyIfNeeded = true + p.hidesOnDeactivate = false + p.isMovableByWindowBackground = true + p.isReleasedWhenClosed = false + p.collectionBehavior = [.canJoinAllSpaces, .stationary, .ignoresCycle, .fullScreenAuxiliary] + p.backgroundColor = .clear + p.isOpaque = false + p.hasShadow = true + // Boksen er til mennesket, ikke til agenternes skaermbilleder. + p.sharingType = .none +} + /// Maa boksens knapper goere noget nu? Ikke foer BOKS_PAUSE efter et nyt spoergsmaal, /// og ikke mens Touch ID-arket er oppe (et andet tryk ville starte endnu et, R17 Opus 4f). func boksKnapperAktive(sidenNytSpoergsmaal: TimeInterval, touchIdIGang: Bool) -> Bool { diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index 874d7325..53ff6658 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -325,6 +325,8 @@ final class Boks: NSPanel { let titel = NSTextField(labelWithString: "") let tekst = NSTextField(wrappingLabelWithString: "") let knapper = NSStackView() + /// Stopknappen i sin egen raekke (R24: med gør-selv-knapperne var raekken 465 af 336 px). + let stopRaekke = NSStackView() let vaelger = NSPopUpButton(frame: .zero, pullsDown: false) let stak = NSStackView() var valgt: String? = nil @@ -353,21 +355,9 @@ final class Boks: NSPanel { super.init(contentRect: NSRect(x: 0, y: 0, width: bredde, height: 78), styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false) - // ⛔ R22 (Opus, MAALT): `isFloatingPanel = true` nulstiller `level` til det almindelige - // svaevelag (3), saa boksen - og dens stopknap - kunne daekkes af ethvert andet - // programs svaevende panel. Laget saettes derfor EFTER. - isFloatingPanel = true - level = .statusBar - becomesKeyOnlyIfNeeded = true - hidesOnDeactivate = false - isMovableByWindowBackground = true - isReleasedWhenClosed = false - collectionBehavior = [.canJoinAllSpaces, .stationary, .ignoresCycle, .fullScreenAuxiliary] - backgroundColor = .clear - isOpaque = false - hasShadow = true - // Boksen er til mennesket, ikke til agenternes skaermbilleder. - sharingType = .none + // ⛔ R22/R24 (Opus, MAALT): laget skal saettes EFTER isFloatingPanel - samlet i + // boksPanelOpsaetning (Tekst.swift), som prøven maaler paa et rigtigt panel. + boksPanelOpsaetning(self) let baggrund = NSVisualEffectView(frame: contentView!.bounds) baggrund.autoresizingMask = [.width, .height] @@ -392,7 +382,8 @@ final class Boks: NSPanel { stak.spacing = 6 stak.edgeInsets = NSEdgeInsets(top: 10, left: 12, bottom: 10, right: 12) stak.translatesAutoresizingMaskIntoConstraints = false - for v in [titel, tekst, knapper] as [NSView] { stak.addArrangedSubview(v) } + stopRaekke.orientation = .horizontal + for v in [titel, tekst, stopRaekke, knapper] as [NSView] { stak.addArrangedSubview(v) } baggrund.addSubview(stak) NSLayoutConstraint.activate([ stak.leadingAnchor.constraint(equalTo: baggrund.leadingAnchor), @@ -431,15 +422,17 @@ final class Boks: NSPanel { titel.stringValue = ind.titel titel.textColor = ind.orange ? .systemOrange : .labelColor tekst.stringValue = ind.linjer.joined(separator: "\n") - for v in knapper.arrangedSubviews { knapper.removeArrangedSubview(v); v.removeFromSuperview() } + for r in [knapper, stopRaekke] { for v in r.arrangedSubviews { r.removeArrangedSubview(v); v.removeFromSuperview() } } // Flere agenter: vaelgeren bestemmer hvem «Follow» foelger. - if !ind.orange && sessioner.count > 1 { + // Vaelgeren og Follow: kun naar intet spoergsmaal vises (R24, Astra: et laan er + // ogsaa orange, og saa blev `valgt` aldrig opdateret). + if ny == nil && sessioner.count > 1 { let navne = sessioner.map { navn($0) } if vaelger.itemTitles != navne { vaelger.removeAllItems(); vaelger.addItems(withTitles: navne) } if let v = valgt, let i = sessioner.firstIndex(where: { $0.session == v }) { vaelger.selectItem(at: i) } knapper.addArrangedSubview(vaelger) } - if !ind.orange { + if ny == nil { let i = vaelger.indexOfSelectedItem valgt = (sessioner.count > 1 && sessioner.indices.contains(i)) ? sessioner[i].session : sessioner.first?.session } @@ -450,9 +443,10 @@ final class Boks: NSPanel { b.bezelStyle = .rounded b.controlSize = .small b.font = .systemFont(ofSize: 11) - knapper.addArrangedSubview(b) + if k == TAG_TILBAGE { stopRaekke.addArrangedSubview(b) } else { knapper.addArrangedSubview(b) } } knapper.isHidden = knapper.arrangedSubviews.isEmpty + stopRaekke.isHidden = stopRaekke.arrangedSubviews.isEmpty opdaterKnapper() stak.layoutSubtreeIfNeeded() let hoejde = ceil(stak.fittingSize.height) @@ -747,7 +741,7 @@ final class Ikon: NSObject, NSMenuDelegate { guard let l = aktivtLaan, !l.lukket, let til = laanTil else { return nil } return (klient: l.s.client, minutter: max(0, Int(ceil(til.timeIntervalSinceNow / 60)))) }() - if laan == nil && (s.isEmpty || boksSlaaetFra || !arbejder) { + if !boksSynlig(laan: laan != nil, sessioner: s.count, slaaetFra: boksSlaaetFra, arbejder: arbejder) { if boks.isVisible { boks.orderOut(nil) } } else { let aktive = s.filter { $0.now != nil || (iso.date(from: $0.updated).map { -$0.timeIntervalSinceNow } ?? 999) < 30 } diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index a88ae077..8af24ca1 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -23,6 +23,7 @@ const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? const ARB = mkdtempSync(join(tmpdir(), 'cmcp-ikon-boks-')); writeFileSync(join(ARB, 'main.swift'), `import Foundation import CoreGraphics +import AppKit struct Ag: Decodable { let navn: String; let maal: String?; let nu: String } struct V: Decodable { let antal: Int; let klient: String?; let tekst: String; let fakta: [String]; let menuKnapper: [String] } struct Hd: Decodable { let knap: String; let knapNonce: String?; let visteNonce: String?; let aktive: Bool } @@ -60,7 +61,17 @@ let ud: [String: Any] = [ "aktive": ind.aktive.map { boksKnapperAktive(sidenNytSpoergsmaal: $0.siden, touchIdIGang: $0.iGang) }, "pause": BOKS_PAUSE, "touchId": ind.touchId.map { t -> String in switch touchIdUdfald(ok: t.ok, erLaan: t.laan) { case .laan: return "laan"; case .svar(let v): return v ? "ja" : "nej" } }, - "max": BOKS_MAX_TEGN] + "max": BOKS_MAX_TEGN, + // R24: synligheden som ren funktion - (laan, sessioner, slaaetFra, arbejder) + "synlig": [(false, 2, false, true), (false, 2, true, true), (false, 2, false, false), (false, 0, false, true), + (true, 2, true, false), (true, 0, true, false), (true, 2, false, true)].map { boksSynlig(laan: $0.0, sessioner: $0.1, slaaetFra: $0.2, arbejder: $0.3) }, + // R24: panelets opsaetning paa et panel der aldrig vises - laget MAALES, ikke laeses i kilden + "panel": { () -> [String: Any] in + _ = NSApplication.shared + let p = NSPanel(contentRect: NSRect(x: 0, y: 0, width: 10, height: 10), styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: true) + boksPanelOpsaetning(p) + return ["lag": p.level.rawValue, "alleSkriveborde": p.collectionBehavior.contains(.canJoinAllSpaces), "fuldskaerm": p.collectionBehavior.contains(.fullScreenAuxiliary), + "ikkeDelt": p.sharingType == .none, "noegle": p.becomesKeyOnlyIfNeeded, "svaever": p.isFloatingPanel] }()] FileHandle.standardOutput.write(try! JSONSerialization.data(withJSONObject: ud)) `); const BIN = join(ARB, 'boks'); @@ -218,21 +229,33 @@ check('5j det forreste vindue er det forreste PROGRAMS (forrestVinduesRamme med /guard let pid = NSWorkspace\.shared\.frontmostApplication\?\.processIdentifier,[\s\S]{0,300}let r = forrestVinduesRamme\(liste, pid: pid\)\n\s+else \{ return nil \}\n\s+return cocoaRamme\(r, hovedHoejde: hovedHoejde\)/.test(m)); check('5h flyttes med: ny skaerm-opsaetning, og naar mennesket skifter skaerm', /didChangeScreenParametersNotification[\s\S]{0,200}boks\.placer\(\)/.test(m) && /else if boks\.skalFlyttes\(\) \{ boks\.placer\(\) \}/.test(m)); check('5i boksen tager aldrig tastaturet og beder om ikke at blive delt (sharingType none - om optagelser respekterer det, er UMAALT)', - /override var canBecomeKey: Bool \{ false \}/.test(m) && /sharingType = \.none/.test(m) && /\.nonactivatingPanel/.test(m)); + /override var canBecomeKey: Bool \{ false \}/.test(m) && s.panel.ikkeDelt && /\.nonactivatingPanel/.test(m)); const tikKrop = krop('func tik() {'); +check('5r synligheden (R24, adfaerd): et laan holder boksen fremme uanset alt; ellers kun naar nogen arbejder, der er sessioner, og boksen ikke er slaaet fra', + JSON.stringify(s.synlig) === '[true,false,false,false,true,true,true]', JSON.stringify(s.synlig)); +check('5s ...og tik() afgoer det KUN gennem boksSynlig - boksSlaaetFra bruges ikke andre steder i tik()', + /if !boksSynlig\(laan: laan != nil, sessioner: s\.count, slaaetFra: boksSlaaetFra, arbejder: arbejder\) \{/.test(tikKrop) + && (tikKrop.match(/boksSlaaetFra/g) || []).length === 1, tikKrop.slice(0, 160)); +check('5t panelet (R24, MAALT paa et panel): statuslinjens lag 25, alle skriveborde, fuld skaerm, ikke delt, tager aldrig tastaturet', + s.panel.lag === 25 && s.panel.alleSkriveborde && s.panel.fuldskaerm && s.panel.ikkeDelt && s.panel.noegle && s.panel.svaever, JSON.stringify(s.panel)); +const boksKlasse = m.slice(m.indexOf('final class Boks: NSPanel'), m.indexOf('/// Det forreste programs forreste almindelige vindue')); +check('5u Boks bruger boksPanelOpsaetning, og intet i klassen saetter laget bagefter', + /boksPanelOpsaetning\(self\)/.test(boksKlasse) && !/\blevel\s*=/.test(boksKlasse) && !/isFloatingPanel\s*=/.test(boksKlasse), boksKlasse.slice(0, 80)); +check('5v stopknappen staar i sin EGEN raekke over spoergsmaalets knapper (R24: 465 af 336 px med gør-selv)', + /if k == TAG_TILBAGE \{ stopRaekke\.addArrangedSubview\(b\) \} else \{ knapper\.addArrangedSubview\(b\) \}/.test(m) + && /for v in \[titel, tekst, stopRaekke, knapper\] as \[NSView\]/.test(m)); +check('5w Follow og vaelgeren afgoeres af «intet spoergsmaal» (ny == nil), ikke af orange - et laan er orange (R24, Astra)', + /if ny == nil && sessioner\.count > 1 \{/.test(m) && /if ny == nil \{\n\s+let i = vaelger\.indexOfSelectedItem/.test(m) && !/if !ind\.orange/.test(m)); +check('5x et stop lukker forbindelsen (afslutLaan)', /func afslutLaan\(\) \{ shutdown\(fd, SHUT_RDWR\) \}/.test(m)); check('5n laanet holder boksen fremme - ogsaa stille og ogsaa naar boksen er slaaet fra - og gaar ind i boksIndhold (R22)', /guard let l = aktivtLaan, !l\.lukket, let til = laanTil else \{ return nil \}/.test(tikKrop) - && /if laan == nil && \(s\.isEmpty \|\| boksSlaaetFra \|\| !arbejder\) \{/.test(tikKrop) && /boksIndhold\(arbejder: arbejdende, tilsluttede: s\.count, venter: venter, laan: laan\)/.test(tikKrop), tikKrop.slice(0, 200)); check('5o boksens stopknap er menuens: samme tagTilbageNu, eget kildemaerke, intet Touch ID', /case \.tagTilbage: tagTilbageNu\(kilde: "take-back-box"\)/.test(knapKrop) && /@objc func tagTilbage\(\) \{ tagTilbageNu\(kilde: "take-back"\) \}/.test(m) && /func tagTilbageNu\(kilde: String\) \{\n\s+noterKilde\(kilde\)\n\s+aktivtLaan\?\.afslutLaan\(\)/.test(m)); check('5p stopknappen slaas aldrig fra - hverken af pausen eller af Touch ID-arket', /b\.isEnabled = aktiv \|\| b\.title == TAG_TILBAGE/.test(m)); -check('5q boksen ligger paa statuslinjens lag, ikke det almindelige svaevelag (isFloatingPanel nulstiller level - maalt R22, Opus)', - /isFloatingPanel = true\n\s+level = \.statusBar/.test(m) && !/level = \.statusBar\n\s+isFloatingPanel = true/.test(m)); - // 8 · agentens egne tekster peger paa boksen (R22: 0 af 2 svar i menulinjen 9/10, 2 af 2 i boksen) const vaerktoejer = readFileSync(join(ROOT, 'mcp-server', 'tools.js'), 'utf8'); const beskrivelse = (navn) => { const i = vaerktoejer.indexOf(`name: '${navn}'`); const d = vaerktoejer.indexOf("description: '", i); return i < 0 || d < 0 ? '' : vaerktoejer.slice(d, vaerktoejer.indexOf("',\n", d)); }; From 87799a6c9baa7e8674ab4fcd1b2c590816dab381 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 21:42:36 +0200 Subject: [PATCH 119/132] skrivevagt: key med tekst-taster, set_value paa fokus og valget efter tidsudloeb (R24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R24 (Astra MAALT, Opus LAEST): key med «a», «shift+a» og cmd+v sendte tekst uden skriveDom og uden adgangskodesignalet - R23 punkt 3 var ikke opfyldt. kombiSkriverTekst (ren funktion) udpeger taster der skriver tekst; de doemmes nu som type. set_value paa FOKUS (uden soegning) ser ogsaa signalet. Valget efter en soegning er valgEfterSoegning (ren funktion), saa ÉT fund efter tidsudloeb proeves direkte (Astra: proeven fandt 0 og beviste det ikke). skriv-ankommer 3t, 5t, 5r, 6e-6g, 7c, 7e; 12 skrivevagt-mutanter roede (F1 flyttet, F3/K7-K9 nye); vaelger, knap-ord, klik-ejer, bundet-maal, stille-vej, claims, sende-port, input-maal groenne. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 56 +++++++++++++++++++-- helper/Sources/cmcp-helper/Skrivevagt.swift | 29 +++++++++++ helper/Sources/cmcp-helper/main.swift | 53 ++++++++++--------- test/skriv-ankommer.mjs | 30 +++++++++-- 4 files changed, 138 insertions(+), 30 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 9a80fbb4..160b38b9 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2537,15 +2537,15 @@ }, { "navn": "F1-tidsudloeb-vaelger-alligevel", - "fil": "helper/Sources/cmcp-helper/main.swift", + "fil": "helper/Sources/cmcp-helper/Skrivevagt.swift", "par": [ [ - " if AX.stoppedeTidligt && args.int(\"index\") == nil {\n Out.fail(\"the search stopped", - " if false {\n Out.fail(\"the search stopped" + " if stoppedeTidligt && index == nil { return .ufuldstaendig }\n", + "" ] ], "proeve": "test/skriv-ankommer.mjs", - "forventet": "7c" + "forventet": "7e" }, { "navn": "F2-find-tier-om-tidsudloeb", @@ -2594,5 +2594,53 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "5w" + }, + { + "navn": "F3-vaelgTraef-uden-tidsflag", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + "stoppedeTidligt: AX.stoppedeTidligt, index: args.int(\"index\")", + "stoppedeTidligt: false, index: args.int(\"index\")" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "7c" + }, + { + "navn": "K7-cmd-v-skriver-ikke", + "fil": "helper/Sources/cmcp-helper/Skrivevagt.swift", + "par": [ + [ + " if cmd { return tast == \"v\" }\n", + " if cmd { return false }\n" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6e" + }, + { + "navn": "K8-key-uden-skrivevagt", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if kombiSkriverTekst(combo) {\n let fokusPid", + " if false {\n let fokusPid" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6f" + }, + { + "navn": "K9-fokus-set-value-uden-signal", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " || (fokusVej && skriveDom(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt) {", + " {" + ] + ], + "proeve": "test/skriv-ankommer.mjs", + "forventet": "6g" } ] diff --git a/helper/Sources/cmcp-helper/Skrivevagt.swift b/helper/Sources/cmcp-helper/Skrivevagt.swift index 0ce390ab..e0f0fa31 100644 --- a/helper/Sources/cmcp-helper/Skrivevagt.swift +++ b/helper/Sources/cmcp-helper/Skrivevagt.swift @@ -18,3 +18,32 @@ func skriveDom(fokusSikkert: Bool?, sikkerIndtastning: Bool) -> SkriveDom { guard let s = fokusSikkert else { return .ukendtFokus } return s ? .sikkertFelt : .maa } + +/// Skriver denne tastekombination TEKST i feltet med fokus? (R24, Astra + Opus: `key` +/// med «a» eller cmd+v gik uden om skriveDom.) Bogstaver, tal og mellemrum uden cmd/ctrl +/// (shift, alt og fn giver ogsaa tegn), og cmd+v (indsaet). Genveje og flytte-taster ikke. +func kombiSkriverTekst(_ combo: String) -> Bool { + let dele = combo.lowercased().split(separator: "+").map(String.init) + guard let tast = dele.last else { return false } + let mod = Set(dele.dropLast()) + if mod.contains("ctrl") || mod.contains("control") { return false } + let cmd = mod.contains("cmd") || mod.contains("command") || mod.contains("meta") + if cmd { return tast == "v" } + return tast == "space" || (tast.count == 1 && (tast.first!.isLetter || tast.first!.isNumber)) +} + +/// Valget efter en soegning (R23/R24 - ren funktion, saa ÉT fund efter tidsudloeb kan proeves). +enum ValgDom: Equatable { case vaelg(Int), ufuldstaendig, udenforListen, ingen, tvetydigOverskriver, tvetydig } + +func valgEfterSoegning(antal: Int, stoppedeTidligt: Bool, index: Int?, maaGaette: Bool, first: Bool) -> ValgDom { + // ⛔ R23 (Astra, maalt): en soegning der loeb toer for tid har maaske ikke set et + // andet, ens element. Saa vaelges intet af sig selv - kun et udtrykkeligt index. + if stoppedeTidligt && index == nil { return .ufuldstaendig } + if let i = index { return i >= 0 && i < antal ? .vaelg(i) : .udenforListen } + if antal == 0 { return .ingen } + if antal > 1 { + if !maaGaette { return .tvetydigOverskriver } + if !first { return .tvetydig } + } + return .vaelg(0) +} diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index 66c7bff2..d8954e04 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -79,31 +79,24 @@ func denySet(_ a: Args) -> Set { /// Vælg ét træf. --index N er nummeret i den liste, find (og en tvetydig fejl) viste. /// Uden --index: præcis ét træf, eller --first når kaldet må gætte (press). func vaelgTraef(_ hits: [AX.Match], _ args: Args, maaGaette: Bool) -> AX.Match { - // ⛔ R23 (Astra, maalt): en soegning der loeb toer for tid har maaske ikke set et - // andet, ens element - og et enkelt fund blev skrevet i. Saa vaelges intet af sig selv. - if AX.stoppedeTidligt && args.int("index") == nil { + switch valgEfterSoegning(antal: hits.count, stoppedeTidligt: AX.stoppedeTidligt, index: args.int("index"), maaGaette: maaGaette, first: args.flag("first")) { + case .vaelg(let i): + return hits[i] + case .ufuldstaendig: Out.fail("the search stopped after \(Int(AX.tidsgraense)) seconds before it had seen the whole app, so another matching element cannot be ruled out - nothing was done. Narrow the search (role, subrole, title or a lower depth), or pick one with index from computer_find.", code: "search-incomplete", extra: ["matches": hits.map(\.dict), "count": hits.count, "stopped_early": true]) + case .udenforListen: + Out.fail("there is no match number \(args.int("index") ?? -1); there are \(hits.count)", code: "not-found", + extra: ["matches": hits.map(\.dict), "count": hits.count]) + case .ingen: + Out.fail("nothing matched", code: "not-found", extra: ["count": 0]) + case .tvetydigOverskriver: + Out.fail("found \(hits.count) matches, and this action overwrites text, so it does not guess - pick one with index (its number in matches) or narrow with subrole", + code: "ambiguous", extra: ["matches": hits.map(\.dict), "count": hits.count]) + case .tvetydig: + Out.fail("found \(hits.count) matches - narrow the search, pick one with index, or pass --first", + code: "ambiguous", extra: ["matches": hits.map(\.dict), "count": hits.count]) } - if let i = args.int("index") { - guard i >= 0, i < hits.count else { - Out.fail("there is no match number \(i); there are \(hits.count)", code: "not-found", - extra: ["matches": hits.map(\.dict), "count": hits.count]) - } - return hits[i] - } - guard let first = hits.first else { Out.fail("nothing matched", code: "not-found", extra: ["count": 0]) } - if hits.count > 1 { - if !maaGaette { - Out.fail("found \(hits.count) matches, and this action overwrites text, so it does not guess - pick one with index (its number in matches) or narrow with subrole", - code: "ambiguous", extra: ["matches": hits.map(\.dict), "count": hits.count]) - } - if !args.flag("first") { - Out.fail("found \(hits.count) matches - narrow the search, pick one with index, or pass --first", - code: "ambiguous", extra: ["matches": hits.map(\.dict), "count": hits.count]) - } - } - return first } switch args.command { @@ -546,6 +539,7 @@ case "set-value": // Enten et navngivet element, eller det der har fokus. var target: (el: AXUIElement, dict: [String: Any])? + var fokusVej = false if args.str("app") != nil || args.str("role") != nil || args.str("subrole") != nil || _soeg.title != nil || _soeg.contains != nil { let hits = AX.find(bundleId: args.str("app"), role: args.str("role"), title: _soeg.title, contains: _soeg.contains, subrole: args.str("subrole"), @@ -561,11 +555,13 @@ case "set-value": code: "no-target") } target = f + fokusVej = true } guard let t = target else { Out.fail("intet maal", code: "no-target") } let role = (t.dict["role"] as? String) ?? "" - if AX.isSecure(t.el, role: role) { + // R24 (Astra): paa FOKUS-vejen kan macOS' adgangskodesignal se et felt AX ikke kan. + if AX.isSecure(t.el, role: role) || (fokusVej && skriveDom(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt) { Out.fail("this is a secure field - we do not write into password fields. Ask the person to type it themselves with computer_ask_user.", code: "secure-field", extra: ["element": t.dict]) } @@ -963,6 +959,17 @@ case "key": Perms.require(accessibility: true) guard let combo = args.str("combo") else { Out.fail("--combo is missing", code: "bad-args") } let tastPid = modtager(args) + // ⛔ R24 (Astra + Opus): «a», «shift+a» og cmd+v skriver tekst - samme regel som `type`. + if kombiSkriverTekst(combo) { + let fokusPid = tastPid ?? NSWorkspace.shared.frontmostApplication?.processIdentifier + switch skriveDom(fokusSikkert: AX.fokusErSikkert(pid: fokusPid), sikkerIndtastning: macosSikkerIndtastning()) { + case .maa: break + case .ukendtFokus: + Out.fail("could not see where the keyboard focus is, so a password field cannot be ruled out - '\(combo)' writes text, so it was not sent. Use computer_find + computer_set_value, or ask the person.", code: "focus-unknown") + case .sikkertFelt: + Out.fail("the keyboard focus is in a password field (or macOS secure input is on) - '\(combo)' writes text, so it was not sent. Ask the person to type it themselves with computer_ask_user.", code: "secure-field") + } + } var tastOk = false let tastMaal = Skaerm.maalt(tilPid: tastPid) { tastOk = Input.hotkey(combo, tilPid: tastPid) } guard tastOk else { Out.fail("unknown key combination '\(combo)'", code: "bad-key") } diff --git a/test/skriv-ankommer.mjs b/test/skriv-ankommer.mjs index 45b3b6ce..d14f5421 100644 --- a/test/skriv-ankommer.mjs +++ b/test/skriv-ankommer.mjs @@ -60,6 +60,9 @@ try { check('3 et kodeordsfelt får ingen tekst, heller ikke som tastetryk', nej(r3), JSON.stringify(r3).slice(0, 160)); const r3k = koer('type', '--app', sikker, '--keystrokes', '--text', 'hemmelig123'); check('3k ...heller ikke når tastetryk vælges direkte', nej(r3k), JSON.stringify(r3k).slice(0, 160)); + // 3t (R24): `key` med et bogstav eller cmd+v skriver ogsaa tekst - samme regel. + const r3t = koer('key', '--app', sikker, '--combo', 'a'), r3v = koer('key', '--app', sikker, '--combo', 'cmd+v'); + check('3t key med et bogstav eller cmd+v i et kodeordsfelt: afvist, intet sendt', r3t.ok === false && r3t.code === 'secure-field' && r3v.ok === false && r3v.code === 'secure-field', JSON.stringify([r3t, r3v]).slice(0, 200)); // 3b. Et kodeordsfelt som på en webside (AXTextField med undertypen AXSecureTextField). // macOS beskytter ikke dette; kun vores egen vagt gør. const web = await start({ CMCP_PROEVE_SIKKER: 'web' }); @@ -113,6 +116,10 @@ try { check('5 macOS-adgangskodesignalet taendt: ingen tekst, heller ikke i et almindeligt felt', nej(r5) && !feltet(sei).includes('hemmelig'), JSON.stringify(r5).slice(0, 160)); const r5k = koer('type', '--app', sei, '--keystrokes', '--text', 'hemmelig-sei'); check('5k ...heller ikke som tastetryk', nej(r5k) && !feltet(sei).includes('hemmelig'), JSON.stringify(r5k).slice(0, 160)); + const r5t = koer('key', '--app', sei, '--combo', 'shift+a'); + check('5t ...og key med shift+a sendes heller ikke', r5t.ok === false && r5t.code === 'secure-field' && !feltet(sei).includes('A'), JSON.stringify(r5t).slice(0, 160)); + const r5r = koer('key', '--app', sei, '--combo', 'tab'); + check('5r ...men en flytte-tast (tab) skriver ingen tekst og sendes stadig', r5r.ok === true, JSON.stringify(r5r).slice(0, 120)); try { seiProces.kill(); } catch {} // signalet slukkes med processen - straks // 7. En soegning der loeb toer for tid (R23, Astra): `find` svarede {count: 0} som for @@ -138,9 +145,14 @@ try { writeFileSync(join(A6, 'main.swift'), `import Foundation let tilf: [(Bool?, Bool)] = [(false, false), (true, false), (nil, false), (false, true), (true, true), (nil, true)] print(tilf.map { t -> String in switch skriveDom(fokusSikkert: t.0, sikkerIndtastning: t.1) { case .maa: return "maa"; case .ukendtFokus: return "ukendt"; case .sikkertFelt: return "sikker" } }.joined(separator: ",")) +print(["a", "shift+a", "A", "7", "space", "alt+e", "cmd+v", "Cmd+V", "cmd+shift+v", "return", "tab", "cmd+s", "ctrl+a", "cmd+a", "left", "escape", "ctrl+v", "fn+a"].map { kombiSkriverTekst($0) ? "1" : "0" }.joined()) +let valg: [(Int, Bool, Int?, Bool, Bool)] = [(1, true, nil, false, false), (1, true, nil, true, true), (1, true, 0, false, false), (1, false, nil, false, false), + (2, false, nil, false, false), (2, false, nil, true, false), (2, false, nil, true, true), (0, false, nil, true, true), (2, false, 5, false, false), (0, true, nil, false, false)] +print(valg.map { v -> String in switch valgEfterSoegning(antal: v.0, stoppedeTidligt: v.1, index: v.2, maaGaette: v.3, first: v.4) { + case .vaelg(let i): return "v\\(i)"; case .ufuldstaendig: return "U"; case .udenforListen: return "X"; case .ingen: return "0"; case .tvetydigOverskriver: return "T"; case .tvetydig: return "t" } }.joined(separator: ",")) `); execFileSync('swiftc', ['-O', join(KILDE, 'Skrivevagt.swift'), join(A6, 'main.swift'), '-o', join(A6, 'v')], { stdio: 'pipe', timeout: 300000 }); - const dom = execFileSync(join(A6, 'v'), { encoding: 'utf8' }).trim(); + const [dom, kombi, valgDom] = execFileSync(join(A6, 'v'), { encoding: 'utf8' }).trim().split('\n'); rmSync(A6, { recursive: true, force: true }); check('6a afgoerelsen: kun et kendt, almindeligt felt uden adgangskodesignal maa skrives i; signalet er et nej, aldrig et ja', dom === 'maa,sikker,ukendt,sikker,sikker,sikker', dom); @@ -155,10 +167,22 @@ print(tilf.map { t -> String in switch skriveDom(fokusSikkert: t.0, sikkerIndtas /switch skriveDom\(fokusSikkert: AX\.fokusErSikkert\(pid: NSWorkspace\.shared\.frontmostApplication\?\.processIdentifier\),\n\s+sikkerIndtastning: macosSikkerIndtastning\(\)\) \{\n\s+case \.maa: break\n\s+case \.ukendtFokus:\n\s+Out\.fail\([^\n]*code: "focus-unknown"\)\n\s+case \.sikkertFelt:\n\s+Out\.fail\([^\n]*code: "secure-field"\)/.test(pasteKrop) && pasteKrop.indexOf('switch skriveDom(') < pasteKrop.indexOf('AX.pasteText('), pasteKrop.slice(0, 160)); const vaelg = m.slice(m.indexOf('func vaelgTraef('), m.indexOf('return first', m.indexOf('func vaelgTraef('))); - check('7c vaelgTraef: efter tidsudloeb vaelges intet uden et udtrykkeligt index - foer alt andet', - /func vaelgTraef\([^\n]*\n(\s+\/\/[^\n]*\n)*\s+if AX\.stoppedeTidligt && args\.int\("index"\) == nil \{\n\s+Out\.fail\([^\n]*\n\s+code: "search-incomplete"/.test(vaelg), vaelg.slice(0, 200)); + check('7c vaelgTraef afgoeres af valgEfterSoegning med hjaelperens rigtige tidsudloebs-flag', + /switch valgEfterSoegning\(antal: hits\.count, stoppedeTidligt: AX\.stoppedeTidligt, index: args\.int\("index"\), maaGaette: maaGaette, first: args\.flag\("first"\)\) \{/.test(m)); check('7d find-svaret baerer stopped_early, naar soegningen loeb toer for tid', /if AX\.stoppedeTidligt \{\n\s+fundSvar\["stopped_early"\] = true/.test(m) && /Out\.ok\(fundSvar\)/.test(m)); + check('6e en tast der SKRIVER tekst (bogstav, tal, mellemrum, alt/shift + tast, cmd+v) - ikke genveje og flytte-taster (R24)', + kombi === '111111111000000001', kombi); + const tastKrop = m.slice(m.indexOf('case "key":'), m.indexOf('default:', m.indexOf('case "key":'))); + check('6f key: en tast der skriver tekst doemmes af skriveDom FOER den sendes (R24: «a» og cmd+v gik uden om)', + /if kombiSkriverTekst\(combo\) \{\n[\s\S]{0,200}switch skriveDom\(fokusSikkert: AX\.fokusErSikkert\(pid: fokusPid\), sikkerIndtastning: macosSikkerIndtastning\(\)\) \{/.test(tastKrop) + && tastKrop.indexOf('kombiSkriverTekst(combo)') < tastKrop.indexOf('Input.hotkey('), tastKrop.slice(0, 160)); + const svKrop = m.slice(m.indexOf('case "set-value":'), m.indexOf('case "at":')); + check('6g set_value paa FOKUS (uden soegning): ogsaa macOS-signalet doemmer (R24, Astra)', + /if AX\.isSecure\(t\.el, role: role\) \|\| \(fokusVej && skriveDom\(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning\(\)\) == \.sikkertFelt\) \{/.test(svKrop) + && /fokusVej = true/.test(svKrop), svKrop.slice(0, 120)); + check('7e valget efter en soegning (R24, adfaerd med ÉT fund): efter tidsudloeb vaelges intet uden index - heller ikke med --first; index vinder; tvetydigt overskrives aldrig', + valgDom === 'U,U,v0,v0,T,t,v0,0,X,U', valgDom); check('6d signalet er macOS\' eget (IsSecureEventInputEnabled)', /func macosSikkerIndtastning\(\) -> Bool \{ IsSecureEventInputEnabled\(\) \}/.test(readFileSync(join(KILDE, 'Input.swift'), 'utf8'))); } console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); From 22a0aab4ec2e123f421388262f8fd016669c6754 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 22:10:11 +0200 Subject: [PATCH 120/132] tekster: hele laanespoergsmaalet i boksen, 0.2.1 med i noterne, Chrome uden gaet (R24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Laanespoergsmaal over 280 tegn (inkl. serverens «Use your screen for N minutes: ») afvises foer nogen spoerges, saa Allow altid staar i boksen (Opus MAALT: 334 tegn gav kun Deny). skaerm-laan 9b-9c; mutant L1 roed. - Scope og Touch ID-arket naevner boksen, ikke kun menuen. - CHANGELOG: 0.2.1 blev aldrig udgivet og ligger i 0.2.2; release.sh tager nu alt fra ## ned til den sidst udgivne version med i noterne; deprecate-teksten naevner ikke en version npm aldrig fik. - README: Chrome viste sider paa SAMME Mac 9/10, og aarsagen er umaalt; aabningens og graensens Chrome-paastande er betingede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ CHANGELOG.md | 21 +++++++++++++++++---- README.md | 17 +++++++++-------- helper/Sources/cmcp-status/main.swift | 2 +- mcp-server/README.md | 17 +++++++++-------- mcp-server/godkend.js | 2 +- mcp-server/index.js | 11 ++++++++++- mcp-server/tools.js | 2 +- scripts/release.sh | 9 +++++++-- test/release-fejlmatrix.mjs | 2 +- test/skaerm-laan.mjs | 13 ++++++++++++- 11 files changed, 80 insertions(+), 28 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 160b38b9..5e353a42 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2642,5 +2642,17 @@ ], "proeve": "test/skriv-ankommer.mjs", "forventet": "6g" + }, + { + "navn": "L1-loft-kun-paa-grunden", + "fil": "mcp-server/index.js", + "par": [ + [ + " if ([...laanTekst].length > 280) return errorResult(", + " if ([...grund].length > 280) return errorResult(" + ] + ], + "proeve": "test/skaerm-laan.mjs", + "forventet": "9c" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a6b555..b7b38972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ was written down; where a claim has a test, the test is named. ## 0.2.2 +The first version on npm since 0.1.0. It also contains everything under 0.2.1 +below: 0.2.1 was held back in its last live test on 9 October and was never +published on its own. + **It does not ask about what cannot happen.** `computer_press` first runs the same search as a dry run. If nothing matches, more than one thing matches, or the lookup does not answer in time, the press is refused and nobody is asked - a yes @@ -45,6 +49,15 @@ through the accessibility layer and not as key presses - and `computer_paste`, which had no field check at all, now judges the field in front like `type` does: an unknown focus or a password field is refused. The signal only ever adds a no. (`test/skriv-ankommer.mjs` 5, 5k, 6a-6d) +**The whole loan question fits in the box.** A screen-loan question longer than +the 280 characters the box shows in full is refused before anyone is asked, so +`Allow` is always in the box when you are asked; `reason` has room for 248 +characters. The stop button sits on its own row, so a do-it-yourself question +during a loan keeps all its buttons, and `Follow` works during a loan. `key` with +a letter, a digit or `cmd+v` writes text, so it is judged like `computer_type`, +and `computer_set_value` on the focused field also listens to macOS's password +signal. (`test/skaerm-laan.mjs` 9b-9c, `test/ikon-boks.mjs` 5r-5x, +`test/skriv-ankommer.mjs` 3t, 5t, 5r, 6e-6g, 7e) **The screen loan is in the box, with its stop button.** While an agent has your screen, the box says who and how many minutes are left, with `Take the screen back now` first - also while the agent is quiet and also when the box is switched off. @@ -52,7 +65,7 @@ The button works at once: no pause, no Touch ID, whichever question the box is showing. Before, a quiet loan could only be seen in the menu bar. The box now sits on the status bar's layer, so another app's floating panel cannot cover it, and the agent is told to send you to the box. (`test/ikon-boks.mjs` 6e, 7a-7c, 4c, -5n-5q, 8a-8c) +5n-5p, 5r-5x, 8a-8c) **WhatsApp by its name.** WhatsApp's name starts with an invisible character (U+200E, on disk and in the running app), so `app: "WhatsApp"` found nothing: starting it in the background was refused as an unknown app, and so was every @@ -89,9 +102,9 @@ release tooling says when it cannot tell and can be resumed after a failure. ## 0.2.1 -The first release since 0.1.0. A `v0.2.0` tag exists on GitHub from 20 -September, but that version was never published to npm; everything below is -new relative to 0.1.0. +Never published on its own - it ships inside 0.2.2. A `v0.2.0` tag exists on +GitHub from 20 September, but that version was never published to npm either; +everything below is new relative to 0.1.0. **Typing reaches an app in the background.** `computer_type` with an `app` now writes into the field that app has focus in and reads it back, instead of sending diff --git a/README.md b/README.md index e0be7953..355277aa 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,9 @@ draws its own controls on a canvas and publishes nothing - some games, some plotting tools - is still a blind spot. **A browser is a separate case:** the switch above is an Electron API, and Chrome does not implement it. Measured on Chrome: 29 buttons before and after, unchanged. You get the browser's own -window - tabs, toolbar, address bar - and not the page inside it. For a page, -drive the browser with a browser tool. +window - tabs, toolbar, address bar - and the page inside it only when Chrome +has built that tree itself (measured both ways, see the limits below). For a +page, drive the browser with a browser tool. No account, no API key, no model inside it. MIT. @@ -78,7 +79,7 @@ written. There is no moment where an unredacted picture of your desktop exists as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box -through - so both are checked. In a web page the box is only found when the +through - so both are checked. In a web page the field is only found when the browser shows its page to the accessibility layer, and Chrome does that on some Macs and not on others (see the limits below). Where it does not, the field is not painted over; what it shows is the browser's own dots, unless the page itself @@ -445,16 +446,16 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. - **Consent is not containment.** After you approve, the agent drives your real Mac - that is what you approved. If you need a boundary rather than a decision, run it in a VM. That is the honest answer, not a missing feature. -- **It does not see inside web pages.** Measured 23 Sep on two Chromes - the +- **It cannot count on seeing inside web pages.** Measured 23 Sep on two Chromes - the one in use and a clean Chrome for Testing: **zero** web areas in the accessibility tree, no page text, only the browser's own buttons and address bar. Chrome builds that tree for a real screen reader, not for the switch Electron apps honour. Apps built on Electron - VS Code, Slack, Notion, the IDE this was measured in - do expose their content: 4.000 nodes, 1.434 texts, - 267 buttons in one window. On 9 Oct a Chrome on another Mac did show a page - (861 nodes on one page): whether it does depends on a setting Google switches - per machine, not on anything this server does. Until that is measured and - built on, treat a web page as a browser tool's job and an app as this one's. + 267 buttons in one window. On 9 Oct the Chrome on the same Mac did show its + pages (861 nodes on one page). Why it changed is not measured - Chrome decides + for itself when to build that tree. Until that is measured and built on, treat + a web page as a browser tool's job and an app as this one's. - **Keystrokes do not land in a Chromium window that is not focused.** Measured the same day: the helper reported `typed: 21` and `took_screen: false`, and the text arrived nowhere. `computer_set_value` through the accessibility diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index 53ff6658..d925a5d8 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -268,7 +268,7 @@ func touchIdTekst(_ a: Anmodning) -> String { let hvem = renTekst(a.s.client ?? "An agent") if a.s.kind == "screen" { let grund = kort(a.s.text, 90) - return "lend \(hvem) your screen for \(max(1, min(15, a.s.minutes ?? 10))) minutes. It pauses when you use the keyboard or mouse; take it back any time from the menu bar. \u{201C}\(grund)\u{201D}" + return "lend \(hvem) your screen for \(max(1, min(15, a.s.minutes ?? 10))) minutes. It pauses when you use the keyboard or mouse; take it back any time from the box or the menu bar. \u{201C}\(grund)\u{201D}" } let hvor = renTekst(a.s.target) let omfang = renTekst(a.s.scope) diff --git a/mcp-server/README.md b/mcp-server/README.md index 07724dd6..a20192e9 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -37,8 +37,9 @@ draws its own controls on a canvas and publishes nothing - some games, some plotting tools - is still a blind spot. **A browser is a separate case:** the switch above is an Electron API, and Chrome does not implement it. Measured on Chrome: 29 buttons before and after, unchanged. You get the browser's own -window - tabs, toolbar, address bar - and not the page inside it. For a page, -drive the browser with a browser tool. +window - tabs, toolbar, address bar - and the page inside it only when Chrome +has built that tree itself (measured both ways, see the limits below). For a +page, drive the browser with a browser tool. No account, no API key, no model inside it. MIT. @@ -76,7 +77,7 @@ written. There is no moment where an unredacted picture of your desktop exists as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box -through - so both are checked. In a web page the box is only found when the +through - so both are checked. In a web page the field is only found when the browser shows its page to the accessibility layer, and Chrome does that on some Macs and not on others (see the limits below). Where it does not, the field is not painted over; what it shows is the browser's own dots, unless the page itself @@ -443,16 +444,16 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. - **Consent is not containment.** After you approve, the agent drives your real Mac - that is what you approved. If you need a boundary rather than a decision, run it in a VM. That is the honest answer, not a missing feature. -- **It does not see inside web pages.** Measured 23 Sep on two Chromes - the +- **It cannot count on seeing inside web pages.** Measured 23 Sep on two Chromes - the one in use and a clean Chrome for Testing: **zero** web areas in the accessibility tree, no page text, only the browser's own buttons and address bar. Chrome builds that tree for a real screen reader, not for the switch Electron apps honour. Apps built on Electron - VS Code, Slack, Notion, the IDE this was measured in - do expose their content: 4.000 nodes, 1.434 texts, - 267 buttons in one window. On 9 Oct a Chrome on another Mac did show a page - (861 nodes on one page): whether it does depends on a setting Google switches - per machine, not on anything this server does. Until that is measured and - built on, treat a web page as a browser tool's job and an app as this one's. + 267 buttons in one window. On 9 Oct the Chrome on the same Mac did show its + pages (861 nodes on one page). Why it changed is not measured - Chrome decides + for itself when to build that tree. Until that is measured and built on, treat + a web page as a browser tool's job and an app as this one's. - **Keystrokes do not land in a Chromium window that is not focused.** Measured the same day: the helper reported `typed: 21` and `took_screen: false`, and the text arrived nowhere. `computer_set_value` through the accessibility diff --git a/mcp-server/godkend.js b/mcp-server/godkend.js index ebe98ad1..ca5db961 100644 --- a/mcp-server/godkend.js +++ b/mcp-server/godkend.js @@ -124,7 +124,7 @@ export async function laanSkaermen({ session, client, text, minutter }, timeoutS sock.on('connect', () => { sock.write(JSON.stringify({ nonce, session, client: ren(client).slice(0, 200), text: helTekst, - scope: `If you allow it, the agent may use your screen for ${minutter} minutes: move the pointer, type into the app in front and bring windows forward. Before each step it waits if you are using the keyboard or mouse; a step already running finishes, or stops at once when you take the screen back. Password apps, deletions, and messages in the apps and web chats it recognises still ask. Take the screen back at any time from this menu.`, + scope: `If you allow it, the agent may use your screen for ${minutter} minutes: move the pointer, type into the app in front and bring windows forward. Before each step it waits if you are using the keyboard or mouse; a step already running finishes, or stops at once when you take the screen back. Password apps, deletions, and messages in the apps and web chats it recognises still ask. Take the screen back at any time with Take the screen back now, in the box in the corner of your screen or in this menu.`, target: 'your screen', kind: 'screen', minutes: minutter, expires: frist }) + '\n'); }); diff --git a/mcp-server/index.js b/mcp-server/index.js index 2c2cd430..e004b97f 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -391,6 +391,15 @@ async function skaermLaan(args) { if (!baggrund()) return textResult({ granted: true, already: true, note: 'This server runs with CMCP_BACKGROUND=0: it already has the foreground.' }); const grund = String(args.reason || '').trim(); if (!grund) return errorResult('Refused: say in `reason` what you need the screen for - the person decides on that.'); + // ⛔ R24 (Opus, MAALT): boksen viser hele spoergsmaalet - og Allow - kun op til 280 tegn + // (BOKS_MAX_TEGN i ikonet). En laengere grund gav kun Deny i boksen, mens vejledningen + // sendte mennesket netop dertil. Saa spoerges der ikke om den. + // Loftet gaelder HELE spoergsmaalet - serveren saetter «Use your screen for N minutes: » + // foran (maalt i 9c: en grund paa 280 gav et spoergsmaal paa 311). + const laanMin = Math.max(1, Math.min(15, Number.isInteger(args.minutes) ? args.minutes : 10)); + const laanTekst = `Use your screen for ${laanMin} minutes: ${grund}`; + const plads = 280 - ([...laanTekst].length - [...grund].length); + if ([...laanTekst].length > 280) return errorResult(`Refused: \`reason\` is ${[...grund].length} characters - keep it to one sentence of at most ${plads}, so the person can read the whole question in the box in the corner of their screen and approve it there. Nobody was asked.`); // Runde 1 (Fable F5): et laan der ikke kan skrives i loggen, gives ikke. if (!loggenKanSkrives()) return errorResult(`Refused: the audit log at ${AUDIT_PATH} cannot be written, and the screen is not lent without a record.`); // ⛔ Runde 2 (Astra 1): nummeret blev talt op FOER spoergsmaalet - en anden @@ -398,7 +407,7 @@ async function skaermLaan(args) { // slut ugyldigt, og laanet sluttede aldrig. Nu faar kun et ja et nummer. let nr = null, lukketFoerStart = false; const min = Math.max(1, Math.min(15, Number.isInteger(args.minutes) ? args.minutes : 10)); - const svar = await laanSkaermen({ session: SESSION, client: klientNavn(), text: `Use your screen for ${min} minutes: ${grund}`, minutter: min }, + const svar = await laanSkaermen({ session: SESSION, client: klientNavn(), text: laanTekst, minutter: min }, skaermVentetid(), async () => { // Forbindelsen er lukket: tiden gik, mennesket tog skaermen, ikonet doede, // eller agenten gav den tilbage. Kun DETTE laans slut taeller. diff --git a/mcp-server/tools.js b/mcp-server/tools.js index 4532d23d..95b9fd59 100644 --- a/mcp-server/tools.js +++ b/mcp-server/tools.js @@ -319,7 +319,7 @@ export const TOOLS = [ required: ['action'], properties: { action: { type: 'string', enum: ['request', 'release', 'status'] }, - reason: { type: 'string', description: 'What you need the screen for, in one sentence. The person decides on this.' }, + reason: { type: 'string', description: 'What you need the screen for, in one sentence of at most 248 characters - the person reads the whole question in the box and decides on this.' }, minutes: { type: 'integer', minimum: 1, maximum: 15, description: 'How long, at most 15. Default 10.' } } } diff --git a/scripts/release.sh b/scripts/release.sh index d3cf83c4..21d6efba 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -298,7 +298,12 @@ git push origin "refs/tags/v$V" if gh release view "v$V" >/dev/null 2>&1; then echo " (GitHub-udgivelsen v$V fandtes i forvejen)" else - gh release create "v$V" --title "v$V" --notes-file <(awk "/^## $V/{f=1;next}/^## /{f=0}f" CHANGELOG.md) \ + # ⛔ R24 (Opus): noterne tog kun `## $V`. 0.2.1 blev aldrig udgivet, saa den foerste + # udgivelse siden 0.1.0 manglede halvdelen. Nu: alt fra `## $V` ned til afsnittet for + # den sidst UDGIVNE version (PUBLICERET foer denne koersel) - eller kun `## $V`, hvis + # den ikke staar i CHANGELOG. + NOTER_STOP="^## $TIDLIGERE_UDGIVET"; grep -q "^## $TIDLIGERE_UDGIVET" CHANGELOG.md || NOTER_STOP="^## " + gh release create "v$V" --title "v$V" --notes-file <(awk -v start="^## $V" -v stop="$NOTER_STOP" '$0 ~ start {f=1; next} f && $0 ~ stop {f=0} f' CHANGELOG.md) \ || { echo "⛔ GitHub-udgivelsen fejlede - npm er IKKE roert endnu"; exit 1; } fi @@ -314,7 +319,7 @@ trap - EXIT # usloeret skaermbillede ogsaa ramme 0.2.1 - den version der rettede fejlen. Fejlen # findes kun foer 0.2.1, saa intervallet er fast. SAARBAR="<0.2.1" -DEPR_BESKED="Upgrade to $V: versions before 0.2.1 could return an unredacted screenshot when redaction failed." +DEPR_BESKED="Upgrade to $V: earlier versions could return an unredacted screenshot when redaction failed." # 7/10: reservelinjen var ikke til at koere (ucitéret `<` er en omdirigering, og # beskeden stod som «...»). Nu skrives den ud ordret og citeret. npm deprecate "@agent360/computer-mcp@$SAARBAR" "$DEPR_BESKED" \ diff --git a/test/release-fejlmatrix.mjs b/test/release-fejlmatrix.mjs index ee5ca454..cc521c24 100644 --- a/test/release-fejlmatrix.mjs +++ b/test/release-fejlmatrix.mjs @@ -97,7 +97,7 @@ check('S3 ...og scriptet paastaar ikke at udgivelsen ikke skete', !/udgivelsen s // S4: deprecate fejler -> reservelinjen kan koeres ordret (citeret, hele beskeden). const s4 = scenarie('deprecate-fejl', { npm: { deprecate: 'exit 1' } }); const linje = (s4.ud.match(/^\s+npm deprecate '.*$/m) || [''])[0].trim(); -check('S4 deprecate fejler: reservelinjen er citeret og bærer hele beskeden', /^npm deprecate '@agent360\/computer-mcp@<0\.2\.1' 'Upgrade to [\d.]+: versions before 0\.2\.1 could return an unredacted screenshot when redaction failed\.'$/.test(linje), linje.slice(0, 120)); +check('S4 deprecate fejler: reservelinjen er citeret og bærer hele beskeden', /^npm deprecate '@agent360\/computer-mcp@<0\.2\.1' 'Upgrade to [\d.]+: earlier versions could return an unredacted screenshot when redaction failed\.'$/.test(linje), linje.slice(0, 120)); // S6 (panel R13-R14, fejl a): advarslen rammer kun versionerne FOER 0.2.1 - aldrig « Date: Fri, 9 Oct 2026 22:31:08 +0200 Subject: [PATCH 121/132] README: Chrome-saetningen om samme Mac; 5u forbyder level= udefra (R25) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R25 (Opus): README:84 paastod stadig en umaalt forskel mellem Mac'er - nu «samme Mac, paa ét tidspunkt og ikke paa et andet». 5u kraever nu, at Follow-vinduets panel er det eneste sted i ikonet, der saetter et lag; mutant T12 (boks.level = .floating i tik) er roed. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ README.md | 4 ++-- mcp-server/README.md | 4 ++-- test/ikon-boks.mjs | 4 +++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 5e353a42..0ec18253 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2654,5 +2654,17 @@ ], "proeve": "test/skaerm-laan.mjs", "forventet": "9c" + }, + { + "navn": "T12-boksens-lag-saettes-udefra", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter, laan: laan),", + " boks.level = .floating\n boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter, laan: laan)," + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5u" } ] diff --git a/README.md b/README.md index 355277aa..fdf8cdff 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,8 @@ as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box through - so both are checked. In a web page the field is only found when the -browser shows its page to the accessibility layer, and Chrome does that on some -Macs and not on others (see the limits below). Where it does not, the field is not +browser shows its page to the accessibility layer, and Chrome has done so on one and the same +Mac at one time and not at another (see the limits below). Where it does not, the field is not painted over; what it shows is the browser's own dots, unless the page itself shows the password in plain text. diff --git a/mcp-server/README.md b/mcp-server/README.md index a20192e9..740fe246 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -78,8 +78,8 @@ as a file. Native fields expose the role `AXSecureTextField`; fields in a web page expose role `AXTextField` with the *subrole* `AXSecureTextField`. Checking only the role would catch native fields and let every browser password box through - so both are checked. In a web page the field is only found when the -browser shows its page to the accessibility layer, and Chrome does that on some -Macs and not on others (see the limits below). Where it does not, the field is not +browser shows its page to the accessibility layer, and Chrome has done so on one and the same +Mac at one time and not at another (see the limits below). Where it does not, the field is not painted over; what it shows is the browser's own dots, unless the page itself shows the password in plain text. diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 8af24ca1..d5b9b9d3 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -241,7 +241,9 @@ check('5t panelet (R24, MAALT paa et panel): statuslinjens lag 25, alle skrivebo s.panel.lag === 25 && s.panel.alleSkriveborde && s.panel.fuldskaerm && s.panel.ikkeDelt && s.panel.noegle && s.panel.svaever, JSON.stringify(s.panel)); const boksKlasse = m.slice(m.indexOf('final class Boks: NSPanel'), m.indexOf('/// Det forreste programs forreste almindelige vindue')); check('5u Boks bruger boksPanelOpsaetning, og intet i klassen saetter laget bagefter', - /boksPanelOpsaetning\(self\)/.test(boksKlasse) && !/\blevel\s*=/.test(boksKlasse) && !/isFloatingPanel\s*=/.test(boksKlasse), boksKlasse.slice(0, 80)); + /boksPanelOpsaetning\(self\)/.test(boksKlasse) && !/\blevel\s*=/.test(boksKlasse) && !/isFloatingPanel\s*=/.test(boksKlasse) + // R25 (Opus): ogsaa udefra - den eneste `level =` i ikonets kode er Follow-vinduets eget panel. + && (m.match(/\blevel\s*=/g) || []).length === 1 && /panel\.level = \.floating/.test(m), boksKlasse.slice(0, 80)); check('5v stopknappen staar i sin EGEN raekke over spoergsmaalets knapper (R24: 465 af 336 px med gør-selv)', /if k == TAG_TILBAGE \{ stopRaekke\.addArrangedSubview\(b\) \} else \{ knapper\.addArrangedSubview\(b\) \}/.test(m) && /for v in \[titel, tekst, stopRaekke, knapper\] as \[NSView\]/.test(m)); From b888904b0f8da87fba4d5dc7e9fbda08f35cb8cb Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Fri, 9 Oct 2026 23:03:24 +0200 Subject: [PATCH 122/132] ikon: boksen kom aldrig frem - et skjult ikon (open -g -j) goeres synligt uden at aktiveres (F1 9/10) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MAALT i F1: testikonet (startet af serveren som i virkeligheden) og Gustavs eget 0.2.1-ikon var skjulte programmer (visible = false); boksen fandtes paa lag 25 men var ikke paa skaermen og paa intet skrivebord. «-j» starter skjult, og et skjult program viser ingen vinduer. Boksen er derfor aldrig kommet frem, naar serveren startede ikonet - kun i liveproeven kl. 13:07, hvor ikonet blev startet direkte. visBoksen: NSApp.unhideWithoutActivation() foer orderFrontRegardless. MAALT efter rettelsen, startet via open -g -j: boksen onscreen, lag 25, alpha 1, foran alt; forreste program uaendret (Agent360 IDE foer og efter). ikon-boks 5y; mutanter T13-T14 roede. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 24 ++++++++++++++++++++++++ CHANGELOG.md | 6 ++++++ helper/Sources/cmcp-status/main.swift | 15 +++++++++++++-- test/ikon-boks.mjs | 5 +++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 0ec18253..e85295b2 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2666,5 +2666,29 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "5u" + }, + { + "navn": "T13-skjult-ikon-viser-ikke-boksen", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if NSApp.isHidden { NSApp.unhideWithoutActivation() }\n", + "" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5y" + }, + { + "navn": "T14-skjult-ikon-genvises-ikke", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " if !boks.isVisible || NSApp.isHidden { boks.placer(); visBoksen(boks) }", + " if !boks.isVisible { boks.placer(); visBoksen(boks) }" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5y" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b38972..8fc5e0a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,12 @@ through the accessibility layer and not as key presses - and `computer_paste`, which had no field check at all, now judges the field in front like `type` does: an unknown focus or a password field is refused. The signal only ever adds a no. (`test/skriv-ankommer.mjs` 5, 5k, 6a-6d) +**The box now actually appears.** The server starts the status app hidden, so it +cannot take your focus - and a hidden app shows no windows, so the box never came +up when the server had started it (measured 9 October: not on screen, on no +desktop). The app now makes itself visible without becoming active right before it +shows the box: the box comes up, and the app you are in stays in front. +(`test/ikon-boks.mjs` 5y; measured live: on screen, layer 25, focus unchanged) **The whole loan question fits in the box.** A screen-loan question longer than the 280 characters the box shows in full is refused before anyone is asked, so `Allow` is always in the box when you are asked; `reason` has room for 248 diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index d925a5d8..748ed927 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -461,6 +461,17 @@ final class Boks: NSPanel { } } +/// ⛔ 9/10 (F1, MAALT): serveren starter ikonet med `open -g -j`, og «-j» starter det +/// SKJULT. Et skjult program viser ingen vinduer: boksen kom aldrig frem - hverken i +/// 0.2.1 eller 0.2.2 - naar serveren startede ikonet (visible = false, CGWindowList uden +/// onscreen, paa intet skrivebord). Kun naar ikonet blev startet direkte (liveproeven +/// 13:07) kunne den ses. Nu goeres programmet synligt UDEN at blive aktivt: fokus bliver hos +/// mennesket, og boksen kommer frem. +func visBoksen(_ b: NSPanel) { + if NSApp.isHidden { NSApp.unhideWithoutActivation() } + b.orderFrontRegardless() +} + /// Det forreste programs forreste almindelige vindue, i Cocoa-koordinater - eller nil. func forrestVindue() -> CGRect? { guard let pid = NSWorkspace.shared.frontmostApplication?.processIdentifier, @@ -756,7 +767,7 @@ final class Ikon: NSObject, NSMenuDelegate { } boks.vis(boksIndhold(arbejder: arbejdende, tilsluttede: s.count, venter: venter, laan: laan), nonce: foerste?.s.nonce, sessioner: aktive) - if !boks.isVisible { boks.placer(); boks.orderFrontRegardless() } + if !boks.isVisible || NSApp.isHidden { boks.placer(); visBoksen(boks) } else if boks.skalFlyttes() { boks.placer() } } if s.isEmpty && anmodninger.isEmpty { @@ -1042,7 +1053,7 @@ final class Ikon: NSObject, NSMenuDelegate { NSSound(named: "Glass")?.play() } // Et nyt spoergsmaal flytter boksen hen hvor mennesket er (30/9, live-proeven). - if boks.isVisible { boks.placer(); boks.orderFrontRegardless() } + if boks.isVisible { boks.placer(); visBoksen(boks) } guard UserDefaults.standard.bool(forKey: "banner") else { return } let c = UNMutableNotificationContent() c.title = "An agent needs you" diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index d5b9b9d3..75c8cf05 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -249,6 +249,11 @@ check('5v stopknappen staar i sin EGEN raekke over spoergsmaalets knapper (R24: && /for v in \[titel, tekst, stopRaekke, knapper\] as \[NSView\]/.test(m)); check('5w Follow og vaelgeren afgoeres af «intet spoergsmaal» (ny == nil), ikke af orange - et laan er orange (R24, Astra)', /if ny == nil && sessioner\.count > 1 \{/.test(m) && /if ny == nil \{\n\s+let i = vaelger\.indexOfSelectedItem/.test(m) && !/if !ind\.orange/.test(m)); +check('5y et SKJULT ikon (open -g -j) goeres synligt uden at blive aktivt, foer boksen vises - begge steder (F1 9/10: boksen kom aldrig frem)', + /func visBoksen\(_ b: NSPanel\) \{\n\s+if NSApp\.isHidden \{ NSApp\.unhideWithoutActivation\(\) \}\n\s+b\.orderFrontRegardless\(\)\n\}/.test(m) + && /if !boks\.isVisible \|\| NSApp\.isHidden \{ boks\.placer\(\); visBoksen\(boks\) \}/.test(m) + && /if boks\.isVisible \{ boks\.placer\(\); visBoksen\(boks\) \}/.test(m) + && !/boks\.orderFrontRegardless\(\)/.test(m) && !/NSApp\.unhide\(/.test(m) && !/NSApp\.activate/.test(m)); check('5x et stop lukker forbindelsen (afslutLaan)', /func afslutLaan\(\) \{ shutdown\(fd, SHUT_RDWR\) \}/.test(m)); check('5n laanet holder boksen fremme - ogsaa stille og ogsaa naar boksen er slaaet fra - og gaar ind i boksIndhold (R22)', /guard let l = aktivtLaan, !l\.lukket, let til = laanTil else \{ return nil \}/.test(tikKrop) From adc1228dc934c2852fa54e5bfa8893e4a818d67f Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 01:17:35 +0200 Subject: [PATCH 123/132] mutantport: R9 taget ud - laanevejens 4000-loft kan ikke laengere naas (R24) Fuld port paa 22a0aab: 217 roede, 0 overlevede, 3 uden svar under load 250. Genkoert ved lavere load: Q3 x2 roede; R9 forbliver uden svar, fordi serverens nye 280-loft (index.js, mutant L1) afviser en lang begrundelse FOER godkend.js linje 106 naas - R9 er en aekvivalent mutant. Det generelle 4000-loft (godkend.js:163) bevogtes fortsat af ikon-godkend (A15, G2, G3b). Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index e85295b2..2ffda27d 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -311,18 +311,6 @@ "proeve": "test/skaerm-laan.mjs", "forventet": "5 mennesket bruger" }, - { - "navn": "R9-laan-loft", - "fil": "mcp-server/godkend.js", - "par": [ - [ - " if ([...helTekst].length > TEKST_LOFT) return { ok: false, grund: `the reason is", - " if (false) return { ok: false, grund: `the reason is" - ] - ], - "proeve": "test/skaerm-laan.mjs", - "forventet": "9b" - }, { "navn": "R13-oprindelig-fejl", "fil": "mcp-server/index.js", From 615c52ba8a7b110dd0b0214d2519c3bca3cdbdf1 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 01:42:55 +0200 Subject: [PATCH 124/132] ikon: ogsaa Follow-vinduet vises gennem visBoksen (R26) R26 (Astra + Opus, LAEST): LivePanel.vis kaldte orderFrontRegardless direkte. Startede ikonet skjult og var boksen slaaet fra, kunne Follow fra menuen aabne et vindue der ikke saas (passer med 16:2x: AX viste et Follow- vindue, Gustav saa intet). Nu er visBoksen den eneste vej; 5y binder det, mutant T15 roed. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++++++ helper/Sources/cmcp-status/main.swift | 2 +- test/ikon-boks.mjs | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 2ffda27d..0c069fef 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2678,5 +2678,17 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "5y" + }, + { + "navn": "T15-follow-vindue-i-skjult-ikon", + "fil": "helper/Sources/cmcp-status/main.swift", + "par": [ + [ + " visBoksen(panel) // frem", + " panel.orderFrontRegardless() // frem" + ] + ], + "proeve": "test/ikon-boks.mjs", + "forventet": "5y" } ] diff --git a/helper/Sources/cmcp-status/main.swift b/helper/Sources/cmcp-status/main.swift index 748ed927..c0a8cf6c 100644 --- a/helper/Sources/cmcp-status/main.swift +++ b/helper/Sources/cmcp-status/main.swift @@ -657,7 +657,7 @@ final class LivePanel: NSObject, NSWindowDelegate { panel.setFrameTopLeftPoint(NSPoint(x: skaerm.maxX - 540, y: skaerm.maxY - 10)) } } - panel.orderFrontRegardless() // frem, men IKKE aktiveret + visBoksen(panel) // frem, men IKKE aktiveret - og synligt, selv om ikonet startede skjult (R26) } func opdater() { diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 75c8cf05..5270acf2 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -253,7 +253,9 @@ check('5y et SKJULT ikon (open -g -j) goeres synligt uden at blive aktivt, foer /func visBoksen\(_ b: NSPanel\) \{\n\s+if NSApp\.isHidden \{ NSApp\.unhideWithoutActivation\(\) \}\n\s+b\.orderFrontRegardless\(\)\n\}/.test(m) && /if !boks\.isVisible \|\| NSApp\.isHidden \{ boks\.placer\(\); visBoksen\(boks\) \}/.test(m) && /if boks\.isVisible \{ boks\.placer\(\); visBoksen\(boks\) \}/.test(m) - && !/boks\.orderFrontRegardless\(\)/.test(m) && !/NSApp\.unhide\(/.test(m) && !/NSApp\.activate/.test(m)); + && !/boks\.orderFrontRegardless\(\)/.test(m) && !/NSApp\.unhide\(/.test(m) && !/NSApp\.activate/.test(m) + // R26 (Astra + Opus): ogsaa Follow-vinduet - den eneste direkte orderFrontRegardless er i visBoksen + && (m.match(/orderFrontRegardless\(\)/g) || []).length === 1 && /visBoksen\(panel\)/.test(m)); check('5x et stop lukker forbindelsen (afslutLaan)', /func afslutLaan\(\) \{ shutdown\(fd, SHUT_RDWR\) \}/.test(m)); check('5n laanet holder boksen fremme - ogsaa stille og ogsaa naar boksen er slaaet fra - og gaar ind i boksIndhold (R22)', /guard let l = aktivtLaan, !l\.lukket, let til = laanTil else \{ return nil \}/.test(tikKrop) From ba7e8644b99742e76530285dd7698485db419644 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 12:00:51 +0200 Subject: [PATCH 125/132] =?UTF-8?q?proever:=20sikkerhedsnettet=20kender=20?= =?UTF-8?q?0.2.2's=20bundne=20=C2=AB=3D=C2=BB=20(brugsscenarierne=20va?= =?UTF-8?q?r=20brudt)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maalt 10/10 paa Gustavs Mac: brugsscenarierne gav 3 af 19, fordi vagt- hjaelperen sammenlignede «--app =com.apple.Safari» med «com.apple.Safari» og stoppede proevens egne programmer - siden det bundne maal (R17). Ingen saa det, fordi fremmed-Mac-koerslerne blev afbrudt. Efter rettelsen: 10 af 19 bevist, 4 delvist, 0 fejlet bagved; selvproeven groen (foer: 2 roede). Co-Authored-By: Claude Opus 5.5 --- test/falsk-hjaelper.mjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/falsk-hjaelper.mjs b/test/falsk-hjaelper.mjs index 8ebce0e1..ce0b64aa 100644 --- a/test/falsk-hjaelper.mjs +++ b/test/falsk-hjaelper.mjs @@ -359,6 +359,9 @@ case "$1" in esac ;; *) APP=""; prev=""; for a in "$@"; do [ "$prev" = "--app" ] && APP="$a"; prev="$a"; done + # 0.2.2 (bundet maal, R17): porten sender et koerende maal som «=». Nettet + # sammenligner id'et - ellers stoppede det selv proevens egne programmer (10/10). + APP="\${APP#=}" if [ -z "$APP" ] || ! grep -qxF -- "$APP" "${tilladte}"; then printf '%s\\n' "$*" >> "${spor}" echo '{"ok":false,"code":"test-safety-net","error":"stopped by the test safety net: not an app the test opened"}' From 6efc912b1fb30d613bb9bbd0865da72ad6cfd1e7 Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 13:30:07 +0200 Subject: [PATCH 126/132] =?UTF-8?q?fix(helper):=20et=20billede=20af=20?= =?UTF-8?q?=C3=A9t=20program=20viser=20vinduerne=20paa=20deres=20rigtige?= =?UTF-8?q?=20plads=20(C2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maalt paa macOS 26.4.1: screenshot --app lagde programmets indhold i billedets oeverste venstre hjoerne. Et punkt laest af billedet ramte et andet sted, og sloeringen af kodeordsfelter laa ved siden af indholdet. Rettelse: udtrykkelig kilde-ramme (hele skaermen). Daekkede vinduer fotograferes ogsaa paa deres plads. Proeve test/billede-placering.mjs (roed foer: 1, 4, 5; groen efter), mutant C1. Suite 59/59. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 +++ CHANGELOG.md | 8 ++ helper/Sources/cmcp-helper/Capture.swift | 8 ++ test/billede-placering.mjs | 112 +++++++++++++++++++++++ test/fixture/placering.swift | 30 ++++++ test/run-all.sh | 1 + 6 files changed, 171 insertions(+) create mode 100644 test/billede-placering.mjs create mode 100644 test/fixture/placering.swift diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 0c069fef..9a5b88a4 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2690,5 +2690,17 @@ ], "proeve": "test/ikon-boks.mjs", "forventet": "5y" + }, + { + "navn": "C1-programbillede-uden-kilderamme", + "fil": "helper/Sources/cmcp-helper/Capture.swift", + "par": [ + [ + " cfg.sourceRect = CGRect(x: 0, y: 0, width: display.width, height: display.height)\n", + "\n" + ] + ], + "proeve": "test/billede-placering.mjs", + "forventet": "5" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc5e0a3..35e6c2d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,14 @@ turns orange and shows the whole question - who, what, where it lands and how long a yes counts - with the menu's own buttons: `Allow (Touch ID)` and `Deny`; the buttons wait a second after a new question appears. Allowing still asks for Touch ID every time; for a question longer than 280 characters, `Allow` is only in the menu. (`test/ikon-boks.mjs`) +**A screenshot of one app shows its windows where they are.** Measured on macOS +26.4.1: `computer_screenshot` with an `app` put the app's content in the image's +top-left corner (Calculator at (405, 516) on screen was at (0, 0) in the image), +so a point read off the image was clicked in the wrong place and the blackout over +password fields sat next to the content. On a display that is not Retina, the +image claimed 2 pixels per point while the content sat at 1, with the same result. +The capture now takes the whole display as its source at that display's own +scale. (`test/billede-placering.mjs`) **A search that ran out of time no longer picks for you.** When an app answers so slowly that `computer_find` stops before it has seen the whole app, the answer now says `stopped_early` - before, it looked exactly like an empty app. And diff --git a/helper/Sources/cmcp-helper/Capture.swift b/helper/Sources/cmcp-helper/Capture.swift index 1195a5bd..2c82de00 100644 --- a/helper/Sources/cmcp-helper/Capture.swift +++ b/helper/Sources/cmcp-helper/Capture.swift @@ -221,6 +221,14 @@ enum Capture { let cfg = SCStreamConfiguration() cfg.width = display.width * 2 cfg.height = display.height * 2 + // ⛔ MAALT 10/10 paa macOS 26.4.1: uden denne linje lagde et billede af ÉT + // program programmets indhold i billedets oeverste venstre hjoerne + // (Lommeregneren paa (405, 516) laa i (0, 0)). Et punkt laest af billedet + // ramte saa et andet sted paa skaermen, og sloeringen - der tegnes paa + // rammens rigtige plads - laa ved siden af det den skulle daekke. + // Hele skaermen som kilde: vinduerne staar der, hvor de staar. + // Bevis: test/billede-placering.mjs. + cfg.sourceRect = CGRect(x: 0, y: 0, width: display.width, height: display.height) cfg.capturesAudio = false cfg.showsCursor = false diff --git a/test/billede-placering.mjs b/test/billede-placering.mjs new file mode 100644 index 00000000..c4af4387 --- /dev/null +++ b/test/billede-placering.mjs @@ -0,0 +1,112 @@ +// BILLEDE-PLACERING: et billede af ÉT program viser programmets vinduer der, hvor +// de staar paa skaermen - og sloeringen ligger oven paa det, den skal skjule. +// +// ⛔ HVORFOR DEN FINDES (10/10-2026) +// Maalt paa macOS 26.4.1: `screenshot --app` lagde programmets indhold i +// billedets oeverste venstre hjoerne. Lommeregneren stod paa (405, 516), og +// dens pixels laa i (0, 0). To skader: +// - en agent der laeser et punkt af billedet og klikker der, rammer et andet +// sted paa skaermen - forskudt med vinduets placering +// - sloeringen af kodeordsfelter tegnes paa rammens RIGTIGE plads, altsaa ved +// siden af det indhold den skulle daekke +// Ingen proeve saa det: sloeringsbeviserne fotograferer hele skaermen, aldrig +// ét program. Rettelsen er en udtrykkelig kilde-ramme (hele skaermen) til +// ScreenCaptureKit. +// +// Proeven bruger sit eget proevevindue (2 % synligt, under alle almindelige +// vinduer, musen gaar igennem det). Ingen af menneskets programmer fotograferes. +import { execFileSync, spawn } from 'node:child_process'; +import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'; +import { inflateSync } from 'node:zlib'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const HJAELPER = [process.env.CMCP_HELPER, join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper')].find(p => p && existsSync(p)); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; +const koer = (...a) => { try { return JSON.parse(execFileSync(HJAELPER, a, { encoding: 'utf8', timeout: 60000 })); } + catch (e) { try { return JSON.parse(String(e.stdout)); } catch { return { ok: false, error: String(e.stdout || e.message).slice(0, 200) }; } } }; +const vent = (ms) => new Promise(r => setTimeout(r, ms)); + +// En lille PNG-laeser (8 bit, RGB/RGBA, ikke interlaced) - saa proeven ikke afhaenger af et billedbibliotek. +function laesPng(sti) { + const b = readFileSync(sti); + let p = 8, w = 0, h = 0, type = 0; const idat = []; + while (p < b.length) { + const len = b.readUInt32BE(p), kind = b.toString('latin1', p + 4, p + 8), data = b.subarray(p + 8, p + 8 + len); + if (kind === 'IHDR') { w = data.readUInt32BE(0); h = data.readUInt32BE(4); type = data[9]; + if (data[8] !== 8 || data[12] !== 0 || (type !== 6 && type !== 2)) throw new Error(`PNG-format ikke understoettet (dybde ${data[8]}, type ${type}, interlace ${data[12]})`); } + if (kind === 'IDAT') idat.push(data); + if (kind === 'IEND') break; + p += 12 + len; + } + const bpp = type === 6 ? 4 : 3, raa = inflateSync(Buffer.concat(idat)), rk = w * bpp, ud = Buffer.alloc(h * rk); + for (let y = 0; y < h; y++) { + const f = raa[y * (rk + 1)], ind = raa.subarray(y * (rk + 1) + 1, (y + 1) * (rk + 1)); + for (let x = 0; x < rk; x++) { + const a = x >= bpp ? ud[y * rk + x - bpp] : 0, o = y ? ud[(y - 1) * rk + x] : 0, c = (x >= bpp && y) ? ud[(y - 1) * rk + x - bpp] : 0; + let v = ind[x]; + if (f === 1) v += a; else if (f === 2) v += o; else if (f === 3) v += (a + o) >> 1; + else if (f === 4) { const q = a + o - c, pa = Math.abs(q - a), pb = Math.abs(q - o), pc = Math.abs(q - c); v += (pa <= pb && pa <= pc) ? a : (pb <= pc ? o : c); } + ud[y * rk + x] = v & 255; + } + } + return { w, h, px: (x, y) => { const i = y * rk + x * bpp; return [ud[i], ud[i + 1], ud[i + 2], bpp === 4 ? ud[i + 3] : 255]; } }; +} +// Den mindste ramme om alle pixels der opfylder `hvad`. +function ramme(img, hvad) { + let x0 = Infinity, y0 = Infinity, x1 = -1, y1 = -1; + for (let y = 0; y < img.h; y++) for (let x = 0; x < img.w; x++) if (hvad(img.px(x, y))) { if (x < x0) x0 = x; if (y < y0) y0 = y; if (x > x1) x1 = x; if (y > y1) y1 = y; } + return x1 < 0 ? null : { x0, y0, x1: x1 + 1, y1: y1 + 1 }; +} +const naer = (a, b, tol) => Math.abs(a - b) <= tol; + +const ARB = mkdtempSync(join(tmpdir(), 'cmcp-plac-')); +const navn = 'cmcpplac' + Math.random().toString(36).slice(2, 8); +const BIN = join(ARB, navn); +execFileSync('swiftc', ['-O', join(ROOT, 'test', 'fixture', 'placering.swift'), '-o', BIN], { stdio: 'pipe', timeout: 180000 }); +const barn = spawn(BIN, { stdio: ['ignore', 'pipe', 'ignore'] }); +try { + await new Promise((res) => { barn.stdout.on('data', (d) => { if (/pid=/.test(String(d))) res(); }); setTimeout(res, 15000); }); + let vin = null; + for (const frist = Date.now() + 30000; Date.now() < frist && !vin; await vent(300)) vin = (koer('windows', '--app', navn).windows || [])[0] || null; + check('0 proevevinduet staar paa sin kendte plads (400, 400, 200, 100)', !!vin && vin.frame.x === 400 && vin.frame.y === 400 && vin.frame.w === 200, JSON.stringify(vin?.frame || {})); + + const raaSti = join(ARB, 'raa.png'), sloeretSti = join(ARB, 'sloeret.png'); + const raa = koer('screenshot', '--app', navn, '--no-redact', '--out', raaSti); + if (!raa.ok && /permission|Screen Recording|could not be captured/i.test(raa.error || '')) { + console.log(`SPRUNGET OVER: 4 (ingen skaermoptagelse her: ${String(raa.error).slice(0, 120)}) - bevist intet, ikke bestaaet`); + } else { + const s = raa.pixelsPerPoint, ox = raa.displayOriginX, oy = raa.displayOriginY; + const forvent = { x0: (400 - ox) * s, y0: (400 - oy) * s, x1: (600 - ox) * s, y1: (500 - oy) * s }; + const img = laesPng(raaSti); + const fundet = ramme(img, ([, , , a]) => a > 0); + check('1 billedet af programmet har vinduet DER, hvor det staar paa skaermen (ramme × pixelsPerPoint)', + !!fundet && naer(fundet.x0, forvent.x0, 2) && naer(fundet.y0, forvent.y0, 2) && naer(fundet.x1, forvent.x1, 2) && naer(fundet.y1, forvent.y1, 2), + `fundet ${JSON.stringify(fundet)} · forventet ${JSON.stringify(forvent)}`); + + const sl = koer('screenshot', '--app', navn, '--out', sloeretSti); + const simg = laesPng(sloeretSti); + // Feltet: AX (500, 450)-(580, 480). Midten af det skal vaere sort OG uigennemsigtigt med sloering. + const fx = Math.round((540 - ox) * s), fy = Math.round((465 - oy) * s); + const sort = ([r, g, b, a]) => a === 255 && r < 20 && g < 20 && b < 20; + check('2 med sloering: kodeordsfeltets midte er sort', sl.ok === true && sl.redactedRegions >= 1 && sort(simg.px(fx, fy)), `${JSON.stringify(simg.px(fx, fy))} · ${sl.redactedRegions} omraade(r)`); + check('3 uden sloering: samme punkt er IKKE sort (det er os der sloerer, ikke billedet)', !sort(img.px(fx, fy)), JSON.stringify(img.px(fx, fy))); + // Sloeringen og indholdet skal vaere samme sted: alt det sorte ligger INDEN FOR vinduets indhold. + const sorteRamme = ramme(simg, sort); + check('4 sloeringen ligger inden for vinduets indhold i billedet, ikke ved siden af', + !!sorteRamme && !!fundet && sorteRamme.x0 >= fundet.x0 && sorteRamme.y0 >= fundet.y0 && sorteRamme.x1 <= fundet.x1 && sorteRamme.y1 <= fundet.y1, + `sort ${JSON.stringify(sorteRamme)} · vindue ${JSON.stringify(fundet)}`); + } + // 5. Bundet til kilden (mutantporten genbygger ikke hjaelperen). + const cap = readFileSync(join(ROOT, 'helper', 'Sources', 'cmcp-helper', 'Capture.swift'), 'utf8'); + check('5 optagelsen faar en udtrykkelig kilde-ramme: hele skaermen', + /cfg\.sourceRect = CGRect\(x: 0, y: 0, width: display\.width, height: display\.height\)/.test(cap)); +} finally { + try { barn.kill(); } catch {} + rmSync(ARB, { recursive: true, force: true }); +} +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/fixture/placering.swift b/test/fixture/placering.swift new file mode 100644 index 00000000..8d0d3790 --- /dev/null +++ b/test/fixture/placering.swift @@ -0,0 +1,30 @@ +// Proevevindue til `billede-placering.mjs`: et vindue paa en KENDT plads paa +// hovedskaermen, med et aegte kodeordsfelt paa en kendt plads i vinduet. +// +// Det skal vaere PAA skaermen - et billede af et program tages kun af det der +// er paa skaermen. Saa det goeres usynligt paa anden maade: 2 % synligt, under +// alle almindelige vinduer, og musen gaar igennem det. +import AppKit + +let app = NSApplication.shared +app.setActivationPolicy(.accessory) +// AX-rammen (400, 400, 200, 100) - AppKit regner nedefra. +let H = NSScreen.screens[0].frame.height +let w = NSWindow(contentRect: NSRect(x: 400, y: H - 400 - 100, width: 200, height: 100), + styleMask: [.borderless], backing: .buffered, defer: false) +w.backgroundColor = .white +w.isOpaque = false +w.alphaValue = 0.02 +w.hasShadow = false +w.ignoresMouseEvents = true +w.level = NSWindow.Level(rawValue: NSWindow.Level.normal.rawValue - 1) +w.collectionBehavior = [.canJoinAllSpaces] +w.title = "cmcp-placering" +// Feltet: AX (500, 450) til (580, 480). +let felt = NSSecureTextField(frame: NSRect(x: 100, y: 20, width: 80, height: 30)) +felt.stringValue = "x" +w.contentView?.addSubview(felt) +w.orderFront(nil) +print("pid=\(getpid())") +fflush(stdout) +app.run() diff --git a/test/run-all.sh b/test/run-all.sh index 8d0a9a3c..876abb7b 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -117,6 +117,7 @@ run "revisionskaeden" "node test/audit-chain.mjs" run "den stille vej" "CMCP_KRAEV_STILLE=1 node test/stille-vej.mjs" run "vaelgeren" "node test/vaelger.mjs" run "skriv ankommer" "node test/skriv-ankommer.mjs" +run "billede placering" "node test/billede-placering.mjs" run "genaabn" "node test/genaabn.mjs" run "laeringsfilen" "node test/laering.mjs" run "giv tilbage" "node test/giv-tilbage.mjs" From 3a7cb1b688d2a019119ff91f32ee7ec1318f0bad Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 14:30:29 +0200 Subject: [PATCH 127/132] fix(helper): billedet foelger skaermens egen skala (R28 R1) Opus maalte paa Gustavs skaerm 2 (1x): laerredet var altid 2 pixels pr. punkt, mens ScreenCaptureKit lagde kilden i 1x - indholdet laa i den halve stoerrelse, og sloeringen ved siden af kodeordsfeltet. Nu skaermens egen skala + scalesToFit. billede-placering 6a-6c paa anden skaerm (roed foer: 6a, 6c, 5b), C9. Suite 59/59. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 12 ++++++++ helper/Sources/cmcp-helper/Capture.swift | 14 +++++++-- test/billede-placering.mjs | 36 ++++++++++++++++++++++++ test/fixture/placering.swift | 6 ++-- 4 files changed, 64 insertions(+), 4 deletions(-) diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 9a5b88a4..8dfe6651 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2702,5 +2702,17 @@ ], "proeve": "test/billede-placering.mjs", "forventet": "5" + }, + { + "navn": "C9-laerred-altid-2x", + "fil": "helper/Sources/cmcp-helper/Capture.swift", + "par": [ + [ + " cfg.width = display.width * skala\n", + " cfg.width = display.width * 2\n" + ] + ], + "proeve": "test/billede-placering.mjs", + "forventet": "5b" } ] diff --git a/helper/Sources/cmcp-helper/Capture.swift b/helper/Sources/cmcp-helper/Capture.swift index 2c82de00..76b64cc8 100644 --- a/helper/Sources/cmcp-helper/Capture.swift +++ b/helper/Sources/cmcp-helper/Capture.swift @@ -219,8 +219,18 @@ enum Capture { if plan { box.setPlanKlar(); sem.signal(); return } let cfg = SCStreamConfiguration() - cfg.width = display.width * 2 - cfg.height = display.height * 2 + // ⛔ R28 (Opus, MAALT paa Gustavs skaerm 2, som er 1x): laerredet var altid 2 pixels pr. + // punkt, men ScreenCaptureKit lagde kilden ind i sin EGEN oploesning - 1 pixel pr. + // punkt i et laerred der sagde 2. Indholdet laa i den halve stoerrelse, og sloeringen + // (tegnet efter de 2) ved siden af kodeordsfeltet. Nu: skaermens egen skala, og + // kilden skaleres ind i laerredet, saa de to aldrig kan skilles ad. + let skala: Int = { + guard let m = CGDisplayCopyDisplayMode(display.displayID), m.width > 0 else { return 2 } + return max(1, m.pixelWidth / m.width) + }() + cfg.width = display.width * skala + cfg.height = display.height * skala + cfg.scalesToFit = true // ⛔ MAALT 10/10 paa macOS 26.4.1: uden denne linje lagde et billede af ÉT // program programmets indhold i billedets oeverste venstre hjoerne // (Lommeregneren paa (405, 516) laa i (0, 0)). Et punkt laest af billedet diff --git a/test/billede-placering.mjs b/test/billede-placering.mjs index c4af4387..7cfff3f0 100644 --- a/test/billede-placering.mjs +++ b/test/billede-placering.mjs @@ -100,10 +100,46 @@ try { !!sorteRamme && !!fundet && sorteRamme.x0 >= fundet.x0 && sorteRamme.y0 >= fundet.y0 && sorteRamme.x1 <= fundet.x1 && sorteRamme.y1 <= fundet.y1, `sort ${JSON.stringify(sorteRamme)} · vindue ${JSON.stringify(fundet)}`); } + // 6. R28 (Opus, MAALT): paa en skaerm med en anden skala (1x) og et origo ≠ 0 laa indholdet i + // 1 pixel pr. punkt i et lærred der paastod 2 - og sloeringen ved siden af. Samme proeve dér. + const skaerme = (koer('displays').displays || []); + const anden = skaerme.find(d => !d.main); + if (!anden) { + console.log('SPRUNGET OVER: 3 (6a-6c kraever en skaerm mere end hovedskaermen) - bevist intet, ikke bestaaet'); + } else { + const navn2 = navn + 'b', BIN2 = join(ARB, navn2); + execFileSync('cp', [BIN, BIN2]); + const barn2 = spawn(BIN2, { stdio: ['ignore', 'pipe', 'ignore'], env: { ...process.env, PLAC_DX: String(anden.x) } }); + try { + await new Promise((res) => { barn2.stdout.on('data', (d) => { if (/pid=/.test(String(d))) res(); }); setTimeout(res, 15000); }); + let v2 = null; + for (const frist = Date.now() + 30000; Date.now() < frist && !v2; await vent(300)) v2 = (koer('windows', '--app', navn2).windows || [])[0] || null; + const r2 = join(ARB, 'raa2.png'), s2 = join(ARB, 'sloeret2.png'); + const a2 = koer('screenshot', '--app', navn2, '--no-redact', '--display-id', String(anden.id), '--out', r2); + const b2 = koer('screenshot', '--app', navn2, '--display-id', String(anden.id), '--out', s2); + if (!a2.ok || !b2.ok || !v2) { + check('6a billede paa den anden skaerm', false, JSON.stringify({ v2, a2, b2 }).slice(0, 300)); + } else { + const k = a2.pixelsPerPoint, ox2 = a2.displayOriginX, oy2 = a2.displayOriginY; + const im2 = laesPng(r2), fu2 = ramme(im2, ([, , , al]) => al > 0); + const fv2 = { x0: (v2.frame.x - ox2) * k, y0: (v2.frame.y - oy2) * k, x1: (v2.frame.x + 200 - ox2) * k, y1: (v2.frame.y + 100 - oy2) * k }; + check('6a anden skaerm: vinduet ligger DER, hvor rammen × pixelsPerPoint siger', !!fu2 && naer(fu2.x0, fv2.x0, 2) && naer(fu2.y0, fv2.y0, 2) && naer(fu2.x1, fv2.x1, 2) && naer(fu2.y1, fv2.y1, 2), + `ppp ${k} · fundet ${JSON.stringify(fu2)} · forventet ${JSON.stringify(fv2)}`); + const sim2 = laesPng(s2), sort2 = ([r, g, bb, al]) => al === 255 && r < 20 && g < 20 && bb < 20; + const px2 = [Math.round((v2.frame.x + 140 - ox2) * k), Math.round((v2.frame.y + 65 - oy2) * k)]; + check('6b anden skaerm: kodeordsfeltets midte er sort med sloering', b2.redactedRegions >= 1 && sort2(sim2.px(...px2)), JSON.stringify(sim2.px(...px2))); + const so2 = ramme(sim2, sort2); + check('6c anden skaerm: sloeringen ligger inden for vinduets indhold', !!so2 && !!fu2 && so2.x0 >= fu2.x0 && so2.y0 >= fu2.y0 && so2.x1 <= fu2.x1 && so2.y1 <= fu2.y1, + `sort ${JSON.stringify(so2)} · vindue ${JSON.stringify(fu2)}`); + } + } finally { try { barn2.kill(); } catch {} } + } // 5. Bundet til kilden (mutantporten genbygger ikke hjaelperen). const cap = readFileSync(join(ROOT, 'helper', 'Sources', 'cmcp-helper', 'Capture.swift'), 'utf8'); check('5 optagelsen faar en udtrykkelig kilde-ramme: hele skaermen', /cfg\.sourceRect = CGRect\(x: 0, y: 0, width: display\.width, height: display\.height\)/.test(cap)); + check('5b laerredet foelger skaermens egen skala, og kilden skaleres ind i det', + /cfg\.width = display\.width \* skala/.test(cap) && /cfg\.height = display\.height \* skala/.test(cap) && /cfg\.scalesToFit = true/.test(cap)); } finally { try { barn.kill(); } catch {} rmSync(ARB, { recursive: true, force: true }); diff --git a/test/fixture/placering.swift b/test/fixture/placering.swift index 8d0d3790..eac280e7 100644 --- a/test/fixture/placering.swift +++ b/test/fixture/placering.swift @@ -8,9 +8,11 @@ import AppKit let app = NSApplication.shared app.setActivationPolicy(.accessory) -// AX-rammen (400, 400, 200, 100) - AppKit regner nedefra. +// AX-rammen (400 + PLAC_DX, 400, 200, 100) - AppKit regner nedefra. PLAC_DX flytter vinduet +// over paa en anden skaerm (R28: skala og origo paa en skaerm der ikke er hovedskaermen). let H = NSScreen.screens[0].frame.height -let w = NSWindow(contentRect: NSRect(x: 400, y: H - 400 - 100, width: 200, height: 100), +let DX = Double(ProcessInfo.processInfo.environment["PLAC_DX"] ?? "0") ?? 0 +let w = NSWindow(contentRect: NSRect(x: 400 + DX, y: H - 400 - 100, width: 200, height: 100), styleMask: [.borderless], backing: .buffered, defer: false) w.backgroundColor = .white w.isOpaque = false From 161e4a3e3605d055b84076875597fa65915ff24d Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 16:09:42 +0200 Subject: [PATCH 128/132] fix: en rullemenu bagved aabner ikke over menneskets arbejde (0.2.2, R28 C-minimum) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maalt 10/10 (findes siden computer_press kom): et tryk paa en rullemenu i et program bagved aabnede menuen paa menneskets skaerm, og den blev staaende og fangede mus og tastatur. Begge konsulenter (R28): ret foer 0.2.2 udgives. I baggrunden uden laan afvises tryk paa menuroller (server + hjaelper), og taster/tekst naar fokus i programmet staar paa en menurolle. Under laan som foer. README's loefte («stops and says so») er nu sandt for tryk og taster. test/menu-vagt.mjs 1a-1d, 2a-2b (live, ingen menu aabner), 3. MV1-MV6 roede. Suite 59/59. Co-Authored-By: Claude Opus 5.5 --- .github/mutanter-porte.json | 72 ++++++++++ CHANGELOG.md | 7 + .../Sources/cmcp-helper/Accessibility.swift | 11 ++ helper/Sources/cmcp-helper/Skaerm.swift | 3 + helper/Sources/cmcp-helper/main.swift | 13 +- mcp-server/index.js | 21 ++- mcp-server/tools.js | 2 +- test/fixture/proevemaal.swift | 48 ++++++- test/menu-vagt.mjs | 127 ++++++++++++++++++ test/run-all.sh | 1 + 10 files changed, 297 insertions(+), 8 deletions(-) create mode 100644 test/menu-vagt.mjs diff --git a/.github/mutanter-porte.json b/.github/mutanter-porte.json index 8dfe6651..146548e2 100644 --- a/.github/mutanter-porte.json +++ b/.github/mutanter-porte.json @@ -2714,5 +2714,77 @@ ], "proeve": "test/billede-placering.mjs", "forventet": "5b" + }, + { + "navn": "MV1-tryk-paa-rullemenu-bagved", + "fil": "mcp-server/index.js", + "par": [ + [ + " if (!trykDom.afvis && menuVagt() && MENU_ROLLER.has(trykDom.rolle)) {", + " if (false) {" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "1a" + }, + { + "navn": "MV2-menuvagt-sendes-ikke", + "fil": "mcp-server/index.js", + "par": [ + [ + "const menuFlag = (args) => (args.app && menuVagt() ? ['--menu-vagt'] : []);", + "const menuFlag = (args) => [];" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "1b" + }, + { + "navn": "MV3-menuvagt-ogsaa-i-forgrund", + "fil": "mcp-server/index.js", + "par": [ + [ + "const menuVagt = () => baggrund() && !laanAktivt();", + "const menuVagt = () => true;" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "1d" + }, + { + "navn": "MV4-hjaelper-trykker-menurolle", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if args.flag(\"menu-vagt\"), let rolle = first.dict[\"role\"] as? String, Skaerm.menuRoller.contains(rolle) {", + " if args.flag(\"menu-vagt\"), false, let rolle = first.dict[\"role\"] as? String, Skaerm.menuRoller.contains(rolle) {" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "3" + }, + { + "navn": "MV5-tast-paa-menufokus", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if args.flag(\"menu-vagt\"), let pid = tastPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) {", + " if args.flag(\"menu-vagt\"), false, let pid = tastPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) {" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "3" + }, + { + "navn": "MV6-tekst-paa-menufokus", + "fil": "helper/Sources/cmcp-helper/main.swift", + "par": [ + [ + " if args.flag(\"menu-vagt\"), let pid = skrivPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) {", + " if args.flag(\"menu-vagt\"), false, let pid = skrivPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) {" + ] + ], + "proeve": "test/menu-vagt.mjs", + "forventet": "3" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 35e6c2d7..d3e610b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,13 @@ password fields sat next to the content. On a display that is not Retina, the image claimed 2 pixels per point while the content sat at 1, with the same result. The capture now takes the whole display as its source at that display's own scale. (`test/billede-placering.mjs`) +**A pop-up behind your work stays shut.** Measured: `computer_press` on a pop-up +button in an app behind opened its menu on your screen, and it stayed there - +holding your mouse and keyboard, so a Return chose an item in the app behind - +until you closed it. That has been so since `computer_press` existed. In the +background, a press on a pop-up, menu button or combo box is now refused before +anything is sent, and so are keys and typing when that app's focus is on one; +during a screen loan they work as before. (`test/menu-vagt.mjs`) **A search that ran out of time no longer picks for you.** When an app answers so slowly that `computer_find` stops before it has seen the whole app, the answer now says `stopped_early` - before, it looked exactly like an empty app. And diff --git a/helper/Sources/cmcp-helper/Accessibility.swift b/helper/Sources/cmcp-helper/Accessibility.swift index 5695d223..bbb9fe25 100644 --- a/helper/Sources/cmcp-helper/Accessibility.swift +++ b/helper/Sources/cmcp-helper/Accessibility.swift @@ -371,6 +371,17 @@ enum AX { return string(w as! AXUIElement, kAXTitleAttribute as String) } + /// Rollen paa det element, der har fokus i programmet `pid` (nil = ukendt). + static func fokusRolle(pid: pid_t) -> String? { + let app = AXUIElementCreateApplication(pid) + AXUIElementSetMessagingTimeout(app, 1.0) + var r: CFTypeRef? + guard AXUIElementCopyAttributeValue(app, kAXFocusedUIElementAttribute as CFString, &r) == .success, + let raw = r, CFGetTypeID(raw) == AXUIElementGetTypeID() else { return nil } + // swiftlint:disable:next force_cast + return string(raw as! AXUIElement, kAXRoleAttribute as String) + } + static func fokusErSikkert(pid: pid_t?) -> Bool? { guard let pid else { guard let f = focused() else { return nil } diff --git a/helper/Sources/cmcp-helper/Skaerm.swift b/helper/Sources/cmcp-helper/Skaerm.swift index 0a865b6e..b15dcd31 100644 --- a/helper/Sources/cmcp-helper/Skaerm.swift +++ b/helper/Sources/cmcp-helper/Skaerm.swift @@ -251,6 +251,9 @@ enum Skaerm { return d >= t.addingTimeInterval(-0.5) } + /// Roller hvis tryk eller tast aabner en menu (samme liste som serverens MENU_ROLLER, R28). + static let menuRoller: Set = ["AXPopUpButton", "AXMenuButton", "AXComboBox", "AXMenuBarItem"] + /// Koerer en handling og beskriver den aerligt. static func maalt(tilPid: pid_t?, flyttedeMarkoer: Bool = false, _ handling: () -> Void) -> [String: Any] { diff --git a/helper/Sources/cmcp-helper/main.swift b/helper/Sources/cmcp-helper/main.swift index d8954e04..563ad2b0 100644 --- a/helper/Sources/cmcp-helper/main.swift +++ b/helper/Sources/cmcp-helper/main.swift @@ -809,7 +809,7 @@ case "wait-for": case "press": // Et flag hjaelperen ikke kender, maa ikke ignoreres i stilhed: --subrole blev // tidligere slugt, og kaldet ramte et andet felt end det, agenten bad om (27/9). - let unknownPressFlags = args.ukendte(Set(["match-stdin", "app", "role", "subrole", "title", "contains", "first", "index", "depth", "dry"])) + let unknownPressFlags = args.ukendte(Set(["match-stdin", "app", "role", "subrole", "title", "contains", "first", "index", "depth", "dry", "menu-vagt"])) if !unknownPressFlags.isEmpty { Out.fail("unknown flag(s): \(unknownPressFlags.joined(separator: " "))", code: "bad-args") } let _soeg = laesSoegning(args) Perms.require(accessibility: true) @@ -835,6 +835,11 @@ case "press": } var pressPid: pid_t = -1 AXUIElementGetPid(first.el, &pressPid) + // R28: i baggrunden uden laan (--menu-vagt fra serveren) trykkes en menurolle ikke - menuen + // ville staa paa menneskets skaerm og fange mus og tastatur (maalt 10/10). + if args.flag("menu-vagt"), let rolle = first.dict["role"] as? String, Skaerm.menuRoller.contains(rolle) { + Out.fail("pressing this \(rolle) opens a menu on the person's screen - nothing was pressed. Ask for the screen with computer_request_screen first.", code: "menu-in-background") + } var trykket = false let pressMaal = Skaerm.handletOgGivetTilbage(tilPid: pressPid) { trykket = AX.press(first) } guard trykket else { @@ -901,6 +906,9 @@ case "type": Out.fail("--text or --stdin is missing", code: "bad-args") } let skrivPid = modtager(args) + if args.flag("menu-vagt"), let pid = skrivPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) { + Out.fail("the focus in that app is on a \(rolle) - a key there opens its menu on the person's screen, so nothing was typed. Ask for the screen with computer_request_screen first.", code: "menu-focus") + } // ⛔ R23: macOS' adgangskodesignal er taendt - et kodeordsfelt har fokus et sted. // Intet skrives, hverken gennem tilgaengeligheds-laget eller som tastetryk. if skriveDom(fokusSikkert: false, sikkerIndtastning: macosSikkerIndtastning()) == .sikkertFelt { @@ -959,6 +967,9 @@ case "key": Perms.require(accessibility: true) guard let combo = args.str("combo") else { Out.fail("--combo is missing", code: "bad-args") } let tastPid = modtager(args) + if args.flag("menu-vagt"), let pid = tastPid, let rolle = AX.fokusRolle(pid: pid), Skaerm.menuRoller.contains(rolle) { + Out.fail("the focus in that app is on a \(rolle) - '\(combo)' there can open its menu on the person's screen, so it was not sent. Ask for the screen with computer_request_screen first.", code: "menu-focus") + } // ⛔ R24 (Astra + Opus): «a», «shift+a» og cmd+v skriver tekst - samme regel som `type`. if kombiSkriverTekst(combo) { let fokusPid = tastPid ?? NSWorkspace.shared.frontmostApplication?.processIdentifier diff --git a/mcp-server/index.js b/mcp-server/index.js index e004b97f..95ece081 100644 --- a/mcp-server/index.js +++ b/mcp-server/index.js @@ -540,7 +540,7 @@ async function trykForhaand(args) { const d = await callHelper([...a, '--dry'], { stdin: JSON.stringify(soeg), timeout: 15000 }); const el = d?.would_press; if (!el) return { afvis: 'Refused: what would be pressed could not be determined. Nothing was pressed, and nobody was asked.', grund: 'press: target unknown' }; - return { farlig: [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n)) }; + return { farlig: [el.name, ...(el.names || []), el.title].filter(Boolean).some(n => menuSerFarlig(n)), rolle: el.role }; } catch (err) { if (err instanceof HelperError && (err.code === 'not-found' || err.code === 'ambiguous')) { const ekstra = err.extra ? '\n\n' + JSON.stringify(err.extra, null, 2).slice(0, 1200) : ''; @@ -813,6 +813,12 @@ async function optag(args) { /// Opstart af et lukket program beholder navnet: et id ville lade Launch Services /// vaelge enhver kopi der paastaar id'et (programURL, 24/9). const BUNDET = Symbol('bundet maal'); +// Roller hvis tryk eller tast aabner en menu (R28, 10/10): en menu fra et program bagved tegnes paa +// menneskets skaerm og fanger mus og tastatur, til mennesket selv lukker den. +const MENU_ROLLER = new Set(['AXPopUpButton', 'AXMenuButton', 'AXComboBox', 'AXMenuBarItem']); +// Menuvagten gaelder i baggrunden uden laan; under laan (eller i forgrunden) maa en menu aabnes. +const menuVagt = () => baggrund() && !laanAktivt(); +const menuFlag = (args) => (args.app && menuVagt() ? ['--menu-vagt'] : []); const appArg = (args) => (args[BUNDET] ? `=${args[BUNDET]}` : String(args.app)); /// Et id serveren selv har i haanden (fx porten maal), i den bundne form naar kaldet er bundet /// til netop det id (R18, Astra: sendeportens og vinduernes opslag fik det ubundne id). @@ -1143,7 +1149,7 @@ async function runTool(name, args) { // hemmelige, kaldet gjorde ikke. De gaar nu paa stdin, som den skrevne // tekst har gjort siden 18/9. const { a, soeg } = trykArgv(args); - const r = await callHelper(a, { stdin: JSON.stringify(soeg) }); + const r = await callHelper([...a, ...menuFlag(args)], { stdin: JSON.stringify(soeg) }); // press udfoerer elementets EGEN handling og faar svar fra programmet. return medSkaerm(medEffekt(textResult(r), 'performed'), r); } @@ -1240,7 +1246,7 @@ async function runTool(name, args) { // Hjaelperen har haft --stdin siden 18/9; JS-siden brugte den aldrig. // Det var altsaa et udgivet loefte der var usandt i den udgivne kode. const r = await callHelper(['type', '--stdin', '--cps', String(args.cps || 240), - ...(args.app ? ['--app', appArg(args)] : [])], + ...(args.app ? ['--app', appArg(args)] : []), ...menuFlag(args)], { timeout: Math.max(30000, String(args.text).length * 60), stdin: String(args.text) }); // Med et navngivet program skriver hjaelperen i programmets fokuserede felt og // laeser det tilbage (27/9). Kun det kan kaldes «verified»; tastetryk kvitteres ikke. @@ -1250,7 +1256,7 @@ async function runTool(name, args) { return medInput(r, medEffekt(medSkaerm(textResult(`Typed ${String(args.text).length} characters.` + (args.app ? ' Sent as keystrokes to the app\'s own queue; the app does not confirm them, so read the field back if it matters.' : '') + stilleNote(args.app, r)), r), 'sent')); case 'computer_key': { const r = await callHelper(['key', '--combo', String(args.combo), - ...(args.app ? ['--app', appArg(args)] : [])]); + ...(args.app ? ['--app', appArg(args)] : []), ...menuFlag(args)]); return medEffekt(medSkaerm(textResult(`Pressed ${args.combo}.` + stilleNote(args.app, r)), r), 'sent'); } case 'computer_activate': @@ -1692,6 +1698,13 @@ async function haandterKald(request) { let trykDom = null; if (name === 'computer_press' && effektivTier !== TIER.READ && !kunLaes) { trykDom = await trykForhaand(args); + // ⛔ R28 (maalt 10/10, findes i alle udgivne versioner): et tryk paa en rullemenu bagved aabner + // menuen paa menneskets skaerm, og den bliver staaende og fanger mus og tastatur, til de selv + // lukker den. README lover at rullemenuer er uden for raekkevidde i baggrunden. + if (!trykDom.afvis && menuVagt() && MENU_ROLLER.has(trykDom.rolle)) { + trykDom = { afvis: `Refused: pressing this ${trykDom.rolle} opens a menu, and a menu from an app behind is drawn on the person's screen and holds their mouse and keyboard until they close it. Nothing was pressed. To use a menu or choose in a pop-up, ask for the screen with computer_request_screen first (a pop-up's value cannot be set from behind).`, + grund: `press: would open a menu on the person's screen (${trykDom.rolle})` }; + } if (trykDom.afvis) { record({ tool: name, tier: tool.tier, args: scrubArgs(args), mode: currentMode(), target: targetBundleId, decision: 'denied', asked: false, reason: trykDom.grund }); diff --git a/mcp-server/tools.js b/mcp-server/tools.js index 95b9fd59..f7e610af 100644 --- a/mcp-server/tools.js +++ b/mcp-server/tools.js @@ -295,7 +295,7 @@ export const TOOLS = [ { name: 'computer_press', tier: TIER.WRITE, - description: 'Press an element through its own accessibility action instead of simulating a click on a coordinate. Works while the window is BEHIND another one and never moves the human\'s mouse pointer - so it is the tool to reach for when the agent should not take over the screen. Two or more matches is a refusal, not a guess: narrow the search, or pass first=true if you mean the first one.', + description: 'Press an element through its own accessibility action instead of simulating a click on a coordinate. Works while the window is BEHIND another one and never moves the human\'s mouse pointer - so it is the tool to reach for when the agent should not take over the screen. The exception is anything that opens a menu (a pop-up, a menu button, a combo box): pressing it behind would draw the menu over the person\'s screen and hold their mouse and keyboard, so it is refused until you ask for the screen with computer_request_screen. Two or more matches is a refusal, not a guess: narrow the search, or pass first=true if you mean the first one.', inputSchema: { type: 'object', required: ['app'], diff --git a/test/fixture/proevemaal.swift b/test/fixture/proevemaal.swift index 891e6bb2..7eb1ae3c 100644 --- a/test/fixture/proevemaal.swift +++ b/test/fixture/proevemaal.swift @@ -21,7 +21,14 @@ final class WebKodeord: NSTextField { override func accessibilitySubrole() -> NSAccessibility.Subrole? { .secureTextField } } -final class App: NSObject, NSApplicationDelegate { +/// Et felt der taeller rul (10/10): scroll bagved skal lande i programmet paa et PUNKT, +/// ikke der hvor menneskets markoer staar. +final class RulFelt: NSTextField { + var antal = 0, sum = 0.0 + override func scrollWheel(with e: NSEvent) { antal += 1; sum += e.scrollingDeltaY; stringValue = "rul: \(antal) dy \(Int(sum))" } +} + +final class App: NSObject, NSApplicationDelegate, NSMenuDelegate { var vindue: NSWindow! var felt: NSTextField! var knap: NSButton! @@ -38,6 +45,17 @@ final class App: NSObject, NSApplicationDelegate { var klikMaal: NSButton! @objc func klikket() { klikMaal.title = "KLIKKET" } + var menuTael: NSTextField! + var menuFokus: NSView? = nil + var aabnet = 0, lukket = 0, noed = 0 + func vis() { menuTael.stringValue = "menu: aabnet \(aabnet) lukket \(lukket) noed \(noed)" } + func menuWillOpen(_ m: NSMenu) { + aabnet += 1; vis() + let t = Timer(timeInterval: 3.0, repeats: false) { [weak self] _ in self?.noed += 1; self?.vis(); m.cancelTracking() } + RunLoop.main.add(t, forMode: .eventTracking) + } + func menuDidClose(_ m: NSMenu) { lukket += 1; vis() } + /// Et Gem-panel som ARK paa attrappens eget vindue - uden for skaermen, /// saa intet kan ses. Tilfoejet 22/9: filpaneler er det eneste hul der /// STOPPER en agent, og et panel kan ikke maales uden at et findes. @@ -90,6 +108,23 @@ final class App: NSObject, NSApplicationDelegate { let rulle = NSPopUpButton(frame: NSRect(x: 180, y: 10, width: 110, height: 26)) rulle.addItems(withTitles: ["rulle-A", "rulle-B"]) vindue.contentView?.addSubview(rulle) + // ⛔ 10/10: en menu fra et program BAGVED tegnes paa menneskets skaerm. Kun naar en + // proeve beder om det, taeller rullemenuen aabninger og lukninger i et felt, og den + // lukker sig selv efter 3 s - saa en proeve uden net aldrig efterlader en menu aaben. + if ProcessInfo.processInfo.environment["CMCP_PROEVE_MENU"] == "1" { + // Egen rullemenu paa en FRI plads: «rulle» ovenfor ligger under tekstfeltet, saa et + // klik der rammer den, rammer feltet (maalt 10/10). + vindue.setContentSize(NSSize(width: 300, height: 200)) + let menuRulle = NSPopUpButton(frame: NSRect(x: 10, y: 160, width: 120, height: 26)) + menuRulle.addItems(withTitles: ["menu-A", "menu-B"]) + vindue.contentView?.addSubview(menuRulle) + menuTael = NSTextField(labelWithString: "menu: aabnet 0 lukket 0 noed 0") + menuTael.frame = NSRect(x: 10, y: 130, width: 280, height: 20) + vindue.contentView?.addSubview(menuTael) + menuRulle.menu?.delegate = self + // R28 R4: fokus paa rullemenuen, saa en tast eller tekst bagved kan proeves mod den. + if ProcessInfo.processInfo.environment["CMCP_PROEVE_MENU_FOKUS"] == "1" { menuFokus = menuRulle } + } klikMaal = NSButton(frame: NSRect(x: 180, y: 50, width: 110, height: 24)) klikMaal.title = "klik-maal" @@ -115,6 +150,12 @@ final class App: NSObject, NSApplicationDelegate { andet.stringValue = "filnavn.txt" vindue.contentView?.addSubview(andet) } + if ProcessInfo.processInfo.environment["CMCP_PROEVE_RUL"] == "1" { + vindue.setContentSize(NSSize(width: 300, height: 200)) + let rul = RulFelt(labelWithString: "rul: 0 dy 0") + rul.frame = NSRect(x: 150, y: 130, width: 140, height: 60) + vindue.contentView?.addSubview(rul) + } // Et kodeordsfelt med fokus, når en prøve beder om det: tekst må aldrig sættes // ind her gennem tilgængeligheds-laget (27/9). var foerste: NSView = felt @@ -145,6 +186,7 @@ final class App: NSObject, NSApplicationDelegate { for v in [sidebar, overskrift, beskedfelt] { vindue.contentView?.addSubview(v) } foerste = beskedfelt } + if let mf = menuFokus { foerste = mf } vindue.initialFirstResponder = foerste vindue.makeFirstResponder(foerste) // Fokus flytter ind i et kodeordsfelt MIDT i en skrivning - som et Tab i @@ -168,7 +210,9 @@ final class App: NSObject, NSApplicationDelegate { // En knap der henter programmet frem, som «Nyt Finder-vindue» gjorde på en // fremmed Mac (27/9). Kun når en prøve beder om det - den TAGER skærmen. if ProcessInfo.processInfo.environment["CMCP_PROEVE_HENT_FREM"] == "1" { - let frem = NSButton(frame: NSRect(x: 10, y: 200, width: 120, height: 24)) + // R28 R6: inde i vinduet, saa et KLIK (ikke kun et tryk) ogsaa kan ramme den. + if vindue.contentView!.frame.height < 200 { vindue.setContentSize(NSSize(width: 300, height: 200)) } + let frem = NSButton(frame: NSRect(x: 150, y: 105, width: 140, height: 20)) frem.title = "hent-frem" frem.target = self frem.action = #selector(hentFrem) diff --git a/test/menu-vagt.mjs b/test/menu-vagt.mjs new file mode 100644 index 00000000..42d050cc --- /dev/null +++ b/test/menu-vagt.mjs @@ -0,0 +1,127 @@ +// MENU-VAGT: et tryk eller en tast i et program BAGVED maa aldrig aabne en menu over +// menneskets arbejde. +// +// ⛔ HVORFOR DEN FINDES (10/10-2026, R28) +// Maalt: `computer_press` paa en rullemenu i et program bagved aabnede menuen paa +// menneskets skaerm (menulaget 101). Den blev staaende, til mennesket selv klikkede +// vaek eller trykkede Escape, og imens gik deres tastetryk til menuen - et Return +// vaelger et punkt i programmet bagved. Det har vaeret saadan, siden tryk kom ind. +// README lover, at rullemenuer er uden for raekkevidde i baggrunden. Begge +// konsulenter (R28): ret det i 0.2.2, foer udgivelse. +// +// Proeven bruger sit eget usynlige proevemaal (uden for skaermen, gennemsigtigt). +// Ingen menu aabnes: vagten afviser, foer noget sendes. +import './ryd-op.mjs'; +import './egen-tilstand.mjs'; +import { execFileSync, spawn } from 'node:child_process'; +import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { lavFalskHjaelper, lavFalskSpoerger } from './falsk-hjaelper.mjs'; + +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..'); +const HJAELPER = [process.env.CMCP_HELPER, join(ROOT, 'mcp-server', 'vendor', 'cmcp-helper')].find(p => p && existsSync(p)); +const fails = []; +const check = (l, c, d = '') => { console.log(`${c ? 'OK ' : 'DUMP'} ${l}${d ? ' - ' + d : ''}`); if (!c) fails.push(l); }; +const vent = (ms) => new Promise(r => setTimeout(r, ms)); + +// 1 · Serveren (falsk hjaelper): porten og flaget. +function klient(svar, ekstraEnv = {}) { + const hj = lavFalskHjaelper('cmcp-menuvagt'); + hj.saetSvar(svar); + const env = { ...process.env, CMCP_MODE: 'allow', CMCP_HELPER: hj.sti, + CMCP_OSASCRIPT: lavFalskSpoerger('udloeb', 'cmcp-menuvagt-sp').sti, + CMCP_STATE_DIR: mkdtempSync(join(tmpdir(), 'cmcp-mv-')) }; + delete env.CMCP_BACKGROUND; + Object.assign(env, ekstraEnv); + const srv = spawn('node', [join(ROOT, 'mcp-server', 'index.js')], { env, stdio: ['pipe', 'pipe', 'pipe'] }); + let buf = ''; const venter = new Map(); let n = 0; + srv.stdout.on('data', (d) => { + buf += d; let i; + while ((i = buf.indexOf('\n')) >= 0) { + const l = buf.slice(0, i); buf = buf.slice(i + 1); + if (!l.trim()) continue; + try { const m = JSON.parse(l); venter.get(m.id)?.(m); venter.delete(m.id); } catch { /* videre */ } + } + }); + const rpc = (method, params) => new Promise((res, rej) => { + const id = ++n; venter.set(id, res); + srv.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n'); + setTimeout(() => rej(new Error('timeout ' + method)), 20000); + }); + const kald = async (name, args) => { + const r = await rpc('tools/call', { name, arguments: args }); + return { tekst: (r.result?.content || []).map(c => c.text || '').join('\n'), fejl: !!r.result?.isError }; + }; + return { srv, rpc, kald, hj }; +} +const APPS = { apps: [{ name: 'Finder', bundleId: 'com.apple.finder', pid: 3301, active: true }, + { name: 'Notes', bundleId: 'com.apple.Notes', pid: 3303, active: false }] }; +{ + const { srv, rpc, kald, hj } = klient({ apps: APPS, + 'press --dry': { would_press: { name: 'Sortér', role: 'AXPopUpButton' } }, + key: { ok: true, key: 'space', took_screen: false }, type: { ok: true, typed: 1, took_screen: false } }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'menuvagt', version: '1' } }); + const rp = await kald('computer_press', { app: 'Notes', title: 'Sortér' }); + const tryk = hj.kald().filter(k => k.argv[0] === 'press' && !k.argv.includes('--dry')); + check('1a et tryk paa en rullemenu bagved uden laan: afvist foer noget trykkes, og svaret peger paa skaermlaanet', + rp.fejl && tryk.length === 0 && /menu/i.test(rp.tekst) && /computer_request_screen/.test(rp.tekst), rp.tekst.slice(0, 200)); + await kald('computer_key', { app: 'Notes', combo: 'space' }); + await kald('computer_type', { app: 'Notes', text: 'x' }); + const ind = hj.kald().filter(k => ['key', 'type'].includes(k.argv[0])); + check('1b i baggrunden baerer taster og tekst til et program --menu-vagt til hjaelperen', + ind.length === 2 && ind.every(k => k.argv.includes('--menu-vagt')), JSON.stringify(ind.map(k => k.argv))); + srv.kill(); +} +{ + const { srv, rpc, kald, hj } = klient({ apps: APPS, + 'press --dry': { would_press: { name: 'Vis', role: 'AXButton' } }, press: { ok: true, pressed: { name: 'Vis' }, took_screen: false } }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'menuvagt', version: '1' } }); + await kald('computer_press', { app: 'Notes', title: 'Vis' }); + const tryk = hj.kald().filter(k => k.argv[0] === 'press' && !k.argv.includes('--dry')); + check('1c en almindelig knap bagved trykkes stadig - med --menu-vagt til hjaelperen', tryk.length === 1 && tryk[0].argv.includes('--menu-vagt'), JSON.stringify(tryk.map(k => k.argv))); + srv.kill(); +} +{ + const { srv, rpc, kald, hj } = klient({ apps: APPS, key: { ok: true, key: 'space', took_screen: true } }, { CMCP_BACKGROUND: '0' }); + await rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'menuvagt', version: '1' } }); + await kald('computer_key', { app: 'Notes', combo: 'space' }); + const ind = hj.kald().filter(k => k.argv[0] === 'key'); + check('1d i forgrunden: intet --menu-vagt (en menu maa aabnes)', ind.length === 1 && !ind[0].argv.includes('--menu-vagt'), JSON.stringify(ind.map(k => k.argv))); + srv.kill(); +} + +// 2 · Hjaelperen live mod eget proevemaal: vagten afviser, foer noget sendes - ingen menu aabner. +const koer = (...a) => { try { return JSON.parse(execFileSync(HJAELPER, a, { encoding: 'utf8', timeout: 60000 })); } + catch (e) { try { return JSON.parse(String(e.stdout)); } catch { return { ok: false, error: String(e.stdout || e.message).slice(0, 200) }; } } }; +const ARB = mkdtempSync(join(tmpdir(), 'cmcp-mv-maal-')); +const navn = 'cmcpmv' + Math.random().toString(36).slice(2, 8); +const BIN = join(ARB, navn); +execFileSync('swiftc', ['-O', join(ROOT, 'test', 'fixture', 'proevemaal.swift'), '-o', BIN], { stdio: 'pipe', timeout: 180000 }); +const barn = spawn(BIN, { stdio: ['ignore', 'pipe', 'ignore'], env: { ...process.env, CMCP_PROEVE_MENU: '1', CMCP_PROEVE_MENU_FOKUS: '1' } }); +try { + await new Promise((res) => { barn.stdout.on('data', (d) => { if (/pid=/.test(String(d))) res(); }); setTimeout(res, 15000); }); + for (const frist = Date.now() + 30000; Date.now() < frist; await vent(300)) if ((koer('find', '--app', navn, '--title', 'menu-A', '--limit', '1').matches || []).length) break; + const tael = () => String(((koer('find', '--app', navn, '--role', 'AXStaticText', '--contains', 'menu:', '--limit', '1').matches || [])[0] || {}).name || ''); + const p = koer('press', '--app', navn, '--role', 'AXPopUpButton', '--title', 'menu-A', '--menu-vagt'); + check('2a tryk paa en rullemenu med menuvagt: afvist (menu-in-background), ingen menu aabnet', + p.ok === false && p.code === 'menu-in-background' && /aabnet 0/.test(tael()), JSON.stringify(p).slice(0, 160) + ' · ' + tael()); + const k = koer('key', '--app', navn, '--combo', 'space', '--menu-vagt'); + const t = koer('type', '--app', navn, '--text', ' ', '--menu-vagt'); + check('2b fokus paa en rullemenu: tast og tekst med menuvagt afvist (menu-focus), ingen menu aabnet', + k.code === 'menu-focus' && t.code === 'menu-focus' && /aabnet 0/.test(tael()), JSON.stringify([k.code, t.code]) + ' · ' + tael()); +} finally { + try { barn.kill(); } catch {} + rmSync(ARB, { recursive: true, force: true }); +} + +// 3 · Bundet til kilden (mutantporten genbygger ikke hjaelperen). +const m = readFileSync(join(ROOT, 'helper', 'Sources', 'cmcp-helper', 'main.swift'), 'utf8'); +check('3 hjaelperen: med menuvagt afvises tryk paa en menurolle og tast/tekst med fokus paa en menurolle', + /if args\.flag\("menu-vagt"\), let rolle = first\.dict\["role"\] as\? String, Skaerm\.menuRoller\.contains\(rolle\) \{\n\s+Out\.fail\([^\n]*code: "menu-in-background"\)/.test(m) + && /if args\.flag\("menu-vagt"\), let pid = tastPid, let rolle = AX\.fokusRolle\(pid: pid\), Skaerm\.menuRoller\.contains\(rolle\) \{\n\s+Out\.fail\([^\n]*code: "menu-focus"\)/.test(m) + && /if args\.flag\("menu-vagt"\), let pid = skrivPid, let rolle = AX\.fokusRolle\(pid: pid\), Skaerm\.menuRoller\.contains\(rolle\) \{\n\s+Out\.fail\([^\n]*code: "menu-focus"\)/.test(m)); + +console.log(fails.length ? `DUMPET: ${fails.length} tjek` : 'Alle tjek bestået.'); +process.exit(fails.length ? 1 : 0); diff --git a/test/run-all.sh b/test/run-all.sh index 876abb7b..70907772 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -118,6 +118,7 @@ run "den stille vej" "CMCP_KRAEV_STILLE=1 node test/stille-vej.mjs" run "vaelgeren" "node test/vaelger.mjs" run "skriv ankommer" "node test/skriv-ankommer.mjs" run "billede placering" "node test/billede-placering.mjs" +run "menuvagt" "node test/menu-vagt.mjs" run "genaabn" "node test/genaabn.mjs" run "laeringsfilen" "node test/laering.mjs" run "giv tilbage" "node test/giv-tilbage.mjs" From 76ce40b74fae22e9465c9aca07c5788b5d2caadc Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 17:22:59 +0200 Subject: [PATCH 129/132] =?UTF-8?q?docs:=20README=20siger=20hvad=20menuvag?= =?UTF-8?q?ten=20d=C3=A6kker=20-=20og=20hvad=20den=20ikke=20d=C3=A6kker=20?= =?UTF-8?q?(R29=20Opus)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fdf8cdff..0b31cc77 100644 --- a/README.md +++ b/README.md @@ -475,7 +475,10 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. open the system will not even say which app has focus - and a save panel's *Go to folder* could not be driven through an app's own queue. So the agent can read them, but it cannot choose in them without taking the screen. Today - it stops and says so rather than pretending. + it stops and says so rather than pretending: a press on a pop-up, menu button + or combo box behind is refused, and so are keys while the focus is on one. A + plain button that pops up a menu of its own is not recognised in advance - if + that menu opens over your work, close it with Escape. ## Building from source From 63ff219872538ffc88288ba6c7f4291c72af75fa Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sat, 10 Oct 2026 17:49:25 +0200 Subject: [PATCH 130/132] docs: npm-README udledt af README efter menuvagt-saetningen Co-Authored-By: Claude Opus 5.5 --- mcp-server/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcp-server/README.md b/mcp-server/README.md index 740fe246..cb93c0d3 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -473,7 +473,10 @@ sit unnoticed until it expires. That is a real limitation today, not a setting. open the system will not even say which app has focus - and a save panel's *Go to folder* could not be driven through an app's own queue. So the agent can read them, but it cannot choose in them without taking the screen. Today - it stops and says so rather than pretending. + it stops and says so rather than pretending: a press on a pop-up, menu button + or combo box behind is refused, and so are keys while the focus is on one. A + plain button that pops up a menu of its own is not recognised in advance - if + that menu opens over your work, close it with Escape. ## Building from source From cd553898a53b01eb46c727256b9d965eb9c1b60a Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Sun, 11 Oct 2026 20:21:19 +0200 Subject: [PATCH 131/132] fix(proever): ingen proeve efterlader sine midlertidige mapper (diskchatten 11/10) Maalt 11/10: 8.041 cmcp-*-mapper i $TMPDIR; Mac'en gik ned 11/10 11.03, fordi disken var for fuld. ryd-op.mjs ryddede kun ved bestaaet - og mutantporten faar proeverne til at dumpe med vilje. - ryd-op rydder altid (bestaaet, dumpet, SIGINT/TERM/HUP); CMCP_BEHOLD_PROEVEMAPPER=1 beholder - importeret i de 38 proever der manglede den - run-all.sh: hele suiten i sin egen /tmp/cmcp-s-*-mappe, fjernet i trap EXIT - mutant-porte.py: hver mutant i sin egen /tmp/cmcp-m-*-mappe, fjernet bagefter Bevis: hel suite 59/59 med 8.043 mapper foer og 8.043 efter, 0 tilbage i /tmp. Co-Authored-By: Claude Opus 5.5 --- .github/mutant-porte.py | 11 +++++++++-- test/argumenter.mjs | 1 + test/audit-chain.mjs | 1 + test/billede-placering.mjs | 1 + test/brugsscenarier.mjs | 1 + test/e2e-forloeb.mjs | 1 + test/efter-udgivelsen.mjs | 1 + test/errors.mjs | 1 + test/genaabn.mjs | 1 + test/giv-tilbage.mjs | 1 + test/ikon-boks.mjs | 1 + test/ikon-lyd.mjs | 1 + test/input-maal.mjs | 1 + test/klik-ejer.mjs | 1 + test/laering.mjs | 1 + test/larmende-veje.mjs | 1 + test/launch-lukket.mjs | 1 + test/log-fejl.mjs | 1 + test/mcpb-start.mjs | 1 + test/ombryd.mjs | 1 + test/optagelse-udelukker.mjs | 1 + test/optagelse.mjs | 1 + test/pakken-starter.mjs | 1 + test/readme-log.mjs | 1 + test/readonly-foerst.mjs | 1 + test/release-fejlmatrix.mjs | 1 + test/run-all.sh | 9 +++++++++ test/ryd-op.mjs | 25 +++++++++++++++++++------ test/samtidige-agenter.mjs | 1 + test/samtykke-tekst.mjs | 1 + test/sessionsport.mjs | 1 + test/skriv-ankommer.mjs | 1 + test/stille-vej.mjs | 1 + test/sync-tal-versioner.mjs | 1 + test/tilladelser.mjs | 1 + test/tilstand-isoleret.mjs | 1 + test/tilstede.mjs | 1 + test/touchid-manuel.mjs | 1 + test/vaelger.mjs | 1 + test/vagt.mjs | 1 + 40 files changed, 74 insertions(+), 8 deletions(-) diff --git a/.github/mutant-porte.py b/.github/mutant-porte.py index d1f6927c..15128ff6 100644 --- a/.github/mutant-porte.py +++ b/.github/mutant-porte.py @@ -3,7 +3,7 @@ # Hver mutant i mutanter-porte.json bygger én fejl ind i en vagt; dens proeve SKAL # blive roed. Filen gendannes ALTID fra en kopi taget lige foer - aldrig fra git, # for filen kan baere ucommittet arbejde (30/9: `git checkout` tog en hel funktion). -import hashlib, json, os, subprocess, sys +import hashlib, json, os, shutil, subprocess, sys, tempfile ROD = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) os.chdir(ROD) overlevede, fejl = [], [] @@ -18,11 +18,18 @@ for a, b in par: muteret = muteret.replace(a, b) try: open(m['fil'], 'w', encoding='utf-8').write(muteret) + # 11/10 (diskchatten): hver mutant koerer i sin EGEN midlertidige mappe, som fjernes bagefter. + # Mutanten faar proeven til at dumpe med vilje - og en dumpet proeve efterlod sine mapper: + # tusindvis pr. port, og disken loeb fuld (Mac'en gik ned 11/10 11.03). + tmp = tempfile.mkdtemp(prefix='cmcp-m-', dir='/tmp') try: - k = subprocess.run(['node', m['proeve']], capture_output=True, text=True, timeout=600) + k = subprocess.run(['node', m['proeve']], capture_output=True, text=True, timeout=600, + env={**os.environ, 'TMPDIR': tmp + '/'}) rc, ud = k.returncode, k.stdout except subprocess.TimeoutExpired: rc, ud = 'timeout', '' + finally: + shutil.rmtree(tmp, ignore_errors=True) finally: open(m['fil'], 'w', encoding='utf-8').write(orig) if hashlib.sha256(open(m['fil'], encoding='utf-8').read().encode()).hexdigest() != h: diff --git a/test/argumenter.mjs b/test/argumenter.mjs index 45056bbb..75ce7c00 100644 --- a/test/argumenter.mjs +++ b/test/argumenter.mjs @@ -12,6 +12,7 @@ // 2. hjaelperen afviser en noegle der skulle have en vaerdi men fik et flag // Intet her tager et billede: lag 1 proeves mod en attrap-hjaelper, lag 2 med // `--plan`, der stopper foer optagelsen. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, spawnSync } from 'node:child_process'; import { writeFileSync, chmodSync, readFileSync, existsSync, mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/audit-chain.mjs b/test/audit-chain.mjs index e5f0a975..67303785 100644 --- a/test/audit-chain.mjs +++ b/test/audit-chain.mjs @@ -12,6 +12,7 @@ // paa et sikkerhedsloefte laerer folk at ignorere den. // // Proeven her koerer det der braekkede den: flere processer, samme fil. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { mkdtempSync, readFileSync, writeFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; diff --git a/test/billede-placering.mjs b/test/billede-placering.mjs index 7cfff3f0..5d1ac173 100644 --- a/test/billede-placering.mjs +++ b/test/billede-placering.mjs @@ -15,6 +15,7 @@ // // Proeven bruger sit eget proevevindue (2 % synligt, under alle almindelige // vinduer, musen gaar igennem det). Ingen af menneskets programmer fotograferes. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'; import { inflateSync } from 'node:zlib'; diff --git a/test/brugsscenarier.mjs b/test/brugsscenarier.mjs index 1b5330a9..c5389296 100644 --- a/test/brugsscenarier.mjs +++ b/test/brugsscenarier.mjs @@ -27,6 +27,7 @@ // // ⚠️ Scenarierne er skrevet 27/9 og er IKKE kørt mod de rigtige programmer endnu. // Et rødt scenarie siger hvilket trin der fejlede; dér starter næste skive. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync, readFileSync } from 'node:fs'; diff --git a/test/e2e-forloeb.mjs b/test/e2e-forloeb.mjs index d911ff85..bc21275c 100644 --- a/test/e2e-forloeb.mjs +++ b/test/e2e-forloeb.mjs @@ -19,6 +19,7 @@ // fejlet port roerer intet. // E2E: ét forløb, én frisk server med dagens kode, som en agent ville bruge den. // Laesende paa menneskets RIGTIGE programmer. Skrivende KUN paa attrappen. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/efter-udgivelsen.mjs b/test/efter-udgivelsen.mjs index ba48920f..4160aa0a 100644 --- a/test/efter-udgivelsen.mjs +++ b/test/efter-udgivelsen.mjs @@ -8,6 +8,7 @@ // Koeres i en klon i tmp med lokal bare-origin og attrapper for npm, curl (registret), // mcp-publisher og gh. gh-attrappen sender AEGTE JSON gennem `jq -r "<-q>"`: en tom // liste er `[]`, ikke en tom streng (den forskel kostede en falsk «PR'en findes», R4). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawnSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, readFileSync, chmodSync, existsSync, mkdirSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/errors.mjs b/test/errors.mjs index 504b23d6..c8a18130 100644 --- a/test/errors.mjs +++ b/test/errors.mjs @@ -31,6 +31,7 @@ // synlige Space. Dem er der altid nogle af, og maskinen siger selv hvilke. // Ingen fixtur, ingen binaer i repoet, intet der afhaenger af hvordan // skrivebordet tilfaeldigvis staar. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFile } from 'child_process'; import { existsSync } from 'fs'; import { promisify } from 'util'; diff --git a/test/genaabn.mjs b/test/genaabn.mjs index c455af92..d0a48b02 100644 --- a/test/genaabn.mjs +++ b/test/genaabn.mjs @@ -8,6 +8,7 @@ // det samme, «vis dig», uden at aktivere det. MÅLT på attrappen: vinduet kom, // programmet blev ikke aktivt, og det forreste program var det samme. // Et program der allerede HAR et vindue, røres ikke. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/giv-tilbage.mjs b/test/giv-tilbage.mjs index 810eb6d4..32ade453 100644 --- a/test/giv-tilbage.mjs +++ b/test/giv-tilbage.mjs @@ -11,6 +11,7 @@ // ⛔ KØRER KUN PÅ EN FREMMED MASKINE (CMCP_FREMMED_MASKINE=1). // Prøven FÅR med vilje et program til at tage forgrunden. På Gustavs Mac // ville det tage hans skærm - også hvis rettelsen virker, i et kvart sekund. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/ikon-boks.mjs b/test/ikon-boks.mjs index 5270acf2..231c859b 100644 --- a/test/ikon-boks.mjs +++ b/test/ikon-boks.mjs @@ -8,6 +8,7 @@ // // Proeven starter ALDRIG ikonet og viser intet: den kompilerer Tekst.swift for sig, // laeser det rigtige ikons --dump-question, og binder ikonets kode til reglerne. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, readFileSync, existsSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/ikon-lyd.mjs b/test/ikon-lyd.mjs index a942aa17..85b55d6d 100644 --- a/test/ikon-lyd.mjs +++ b/test/ikon-lyd.mjs @@ -5,6 +5,7 @@ // forloebene gennem den samme LydHukommelse som ikonet - ingen skaerm, intet ikon, // ingen lyd. Og den binder ikonet til reglen: den eneste lyd i main.swift spilles // kun naar skalLyde svarer ja, og menuen kan slaa den fra. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, readFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/input-maal.mjs b/test/input-maal.mjs index 4649abca..2b80bfc9 100644 --- a/test/input-maal.mjs +++ b/test/input-maal.mjs @@ -7,6 +7,7 @@ // // Intet sendes til Mac'en: attrap-hjaelper + en attrap-spoerger der svarer ja // og i samme oejeblik «skifter» det forreste program (en fil attrappen laeser). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { writeFileSync, chmodSync, readFileSync, existsSync, mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/klik-ejer.mjs b/test/klik-ejer.mjs index 136edfee..affaedc3 100644 --- a/test/klik-ejer.mjs +++ b/test/klik-ejer.mjs @@ -7,6 +7,7 @@ // // Intet klikkes: serveren koerer mod en attrap-hjaelper der kun skriver sit // argv ned, og samtykket gaar til en attrap der ikke svarer. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { writeFileSync, chmodSync, readFileSync, existsSync, mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/laering.mjs b/test/laering.mjs index d6b414e7..e18a8240 100644 --- a/test/laering.mjs +++ b/test/laering.mjs @@ -7,6 +7,7 @@ // fandtes en vej videre, og intet sted blev det skrevet ned. Prøven sikrer at // læringen lander i filen, at en persons nummer og mail aldrig gør, og at // svaret siger ærligt at intet er sendt. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { mkdtempSync, readFileSync, existsSync, rmSync } from 'node:fs'; diff --git a/test/larmende-veje.mjs b/test/larmende-veje.mjs index d638e1dc..e95deb7d 100644 --- a/test/larmende-veje.mjs +++ b/test/larmende-veje.mjs @@ -20,6 +20,7 @@ // ⛔ OG DEN MAALER ET AABENT SPOERGSMAAL: tager en AX-vinduesflytning fokus? // `computer_focused` laeses FOER og EFTER. Svaret er et faktum om macOS, // ikke en vurdering - og det afgoer om `computer_window` er fejlklassificeret. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs'; diff --git a/test/launch-lukket.mjs b/test/launch-lukket.mjs index d4cf39b7..17aabba4 100644 --- a/test/launch-lukket.mjs +++ b/test/launch-lukket.mjs @@ -11,6 +11,7 @@ // // Intet startes, intet tager skaermen: serveren koerer mod en attrap-hjaelper // der kun skriver sit argv ned, og samtykket gaar til en attrap der ikke svarer. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { writeFileSync, chmodSync, readFileSync, existsSync, mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/log-fejl.mjs b/test/log-fejl.mjs index 8ce91129..d89d8683 100644 --- a/test/log-fejl.mjs +++ b/test/log-fejl.mjs @@ -7,6 +7,7 @@ // // Intet sendes til Mac'en: serveren koerer mod en attrap-hjaelper der kun // skriver sit argv ned, og logfilen laases med chmod. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { writeFileSync, chmodSync, readFileSync, existsSync, mkdtempSync, mkdirSync, rmSync } from 'node:fs'; diff --git a/test/mcpb-start.mjs b/test/mcpb-start.mjs index 01cc0393..7125f13d 100644 --- a/test/mcpb-start.mjs +++ b/test/mcpb-start.mjs @@ -5,6 +5,7 @@ // som kilden. Koeres af release.yml paa den byggede .mcpb (og i haanden): // node test/mcpb-start.mjs // Uden sti springes proeven over (den kraever en bygget pakke). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, readFileSync, existsSync } from 'node:fs'; diff --git a/test/ombryd.mjs b/test/ombryd.mjs index b1592edf..dae3bf68 100644 --- a/test/ombryd.mjs +++ b/test/ombryd.mjs @@ -6,6 +6,7 @@ // i menuen lige over «Allow». Prøven kompilerer ikonets egen tekst-fil og maaler // at intet tegn falder ud, at ingen linje er for bred, og at usynlige tegn renses. // Ingen skaerm, intet ikon, intet Touch ID. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/optagelse-udelukker.mjs b/test/optagelse-udelukker.mjs index c0d5bb1d..5b48b149 100644 --- a/test/optagelse-udelukker.mjs +++ b/test/optagelse-udelukker.mjs @@ -20,6 +20,7 @@ // UMAALT her, sagt hoejt: at ScreenCaptureKit FAKTISK udelader programmets // pixels, naar det staar i `excludingApplications`. Det er Apples kontrakt. // Et pixel-bevis kraever en optagelse - paa en CI-Mac eller med Gustavs ja. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { spawn, execFileSync, spawnSync } from 'node:child_process'; import { mkdtempSync, mkdirSync, writeFileSync, existsSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/optagelse.mjs b/test/optagelse.mjs index 5539b6d4..87690f4c 100644 --- a/test/optagelse.mjs +++ b/test/optagelse.mjs @@ -4,6 +4,7 @@ // Intet optages her: serveren koerer mod en attrap-hjaelper der skriver en lille fil // og venter paa SIGINT, og samtykket gaar til attrap-spoergere. Den AEGTE optagelse // kan kun maales paa en maskine ingen arbejder paa (CMCP_FREMMED_MASKINE=1). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, spawnSync } from 'node:child_process'; import { createServer } from 'node:net'; diff --git a/test/pakken-starter.mjs b/test/pakken-starter.mjs index 4c29797f..f3de1e0f 100644 --- a/test/pakken-starter.mjs +++ b/test/pakken-starter.mjs @@ -13,6 +13,7 @@ // Derfor maaler den her ikke listen. Den goer det en fremmed goer: pakker, // pakker ud i en tom mappe og starter serveren derfra. Enhver glemt fil - // js, binaer eller andet - faar den til at falde. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { execFileSync, spawn } from 'node:child_process'; import { mkdtempSync, rmSync, symlinkSync, readdirSync } from 'node:fs'; diff --git a/test/readme-log.mjs b/test/readme-log.mjs index 9778d9f3..0114bc16 100644 --- a/test/readme-log.mjs +++ b/test/readme-log.mjs @@ -4,6 +4,7 @@ // en isoleret koersel, og den logs kaede skal holde. Aendres et tegn i uddraget // eller i loggen, er proeven roed. Loggen skrives af scripts/log-uddrag.mjs - // aldrig af et menneskes egen revisionslog. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { readFileSync, mkdtempSync, copyFileSync } from 'node:fs'; import { tmpdir, homedir, hostname } from 'node:os'; import { join, dirname } from 'node:path'; diff --git a/test/readonly-foerst.mjs b/test/readonly-foerst.mjs index a812d0c4..3b8a89f0 100644 --- a/test/readonly-foerst.mjs +++ b/test/readonly-foerst.mjs @@ -5,6 +5,7 @@ // med sin egen grund. Loggen sagde «Send control could not be tied» om et kald der // var afvist af readonly. Nu: readonly-grunden, og ingen opslag for et kald der // alligevel ikke maa ske. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { join, dirname } from 'node:path'; diff --git a/test/release-fejlmatrix.mjs b/test/release-fejlmatrix.mjs index cc521c24..a8449323 100644 --- a/test/release-fejlmatrix.mjs +++ b/test/release-fejlmatrix.mjs @@ -12,6 +12,7 @@ // - origin er en lokal bare-kopi; gh, npm og mcp-publisher er attrapper der logger // - en git-indpakning lader KUN `ls-remote` fejle, naar et scenarie beder om det // Intet naar GitHub, npm eller registret. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawnSync } from 'node:child_process'; import { mkdtempSync, writeFileSync, readFileSync, chmodSync, existsSync, cpSync, mkdirSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/run-all.sh b/test/run-all.sh index 70907772..0def00e1 100755 --- a/test/run-all.sh +++ b/test/run-all.sh @@ -5,6 +5,15 @@ # overleve koerslen, ellers er en flaksende proeve ikke til at undersoege. ROOT="$(cd "$(dirname "$0")/.." && pwd)" LOG="${TMPDIR:-/tmp}/cmcp-suite-$(date +%H%M%S).log" +# ⛔ 11/10 (diskchatten): suiten efterlod hver proeves cmcp-*-mapper i $TMPDIR - 8.041 mapper, +# og Mac'en gik ned 11/10 11.03, fordi disken var for fuld til dvalebilledet. Nu koerer hele +# suiten i sin EGEN korte mappe, som fjernes til sidst - ogsaa naar en proeve dumper, eller +# koerslen afbrydes. Loggen ovenfor ligger uden for og bliver staaende: den er beviset. +# Kort sti med vilje: menulinje-ikonets sokkel maa hoejst vaere 104 tegn. +SUITE_TMP="$(mktemp -d /tmp/cmcp-s-XXXXXX)" +trap 'rm -rf "$SUITE_TMP"' EXIT +trap 'exit 130' INT TERM HUP +export TMPDIR="$SUITE_TMP/" # 7/10 (punkt F): ingen proeve maa ramme menneskets rigtige tilstandsmappe - heller # ikke en der glemmer at saette sin egen. Hver fil kan stadig saette en mere lokal. export CMCP_STATE_DIR="${CMCP_STATE_DIR:-$(mktemp -d "${TMPDIR:-/tmp}/cmcp-suite-tilstand-XXXXXX")}" diff --git a/test/ryd-op.mjs b/test/ryd-op.mjs index aee78e19..87becfa8 100644 --- a/test/ryd-op.mjs +++ b/test/ryd-op.mjs @@ -1,8 +1,8 @@ -// Proevernes midlertidige mapper slettes, naar proeven er BESTAAET. +// Proevernes midlertidige mapper slettes, naar proeven slutter - ogsaa naar den dumper eller afbrydes. // // ⛔ MAALT 30/9-2026: 5.442 cmcp-*-mapper (3,4 GB) i $TMPDIR paa Gustavs Mac - // hver koersel af suiten eller mutationsbeviset efterlod ~400, og disken loeb -// fuld midt i en mutant. En dumpet proeve beholder sine mapper: de er beviset. +// fuld midt i en mutant. import fs from 'node:fs'; import { syncBuiltinESMExports } from 'node:module'; import { tmpdir } from 'node:os'; @@ -17,7 +17,20 @@ fs.mkdtempSync = (prefix, ...rest) => { return d; }; syncBuiltinESMExports(); -process.on('exit', (kode) => { - if (kode !== 0 || process.exitCode) return; - for (const d of mapper) { try { fs.rmSync(d, { recursive: true, force: true }); } catch {} } -}); +// ⛔ 11/10 (diskchatten, maalt 8.041 mapper og et nedbrud 11/10 11.03 fordi disken var fuld): +// «kun ved bestaaet» efterlod ALT fra hver dumpet proeve - og mutantporten faar proeverne +// til at dumpe med vilje, hundredvis af gange pr. koersel. Afbrudte koersler ryddede heller +// intet. Nu ryddes der altid: ved bestaaet, ved dumpet og ved afbrydelse. Skal en dumpet +// proeves mapper gemmes til fejlsoegning, saet CMCP_BEHOLD_PROEVEMAPPER=1. +function ryd() { + if (process.env.CMCP_BEHOLD_PROEVEMAPPER === '1') return; + for (const d of mapper.splice(0)) { try { fs.rmSync(d, { recursive: true, force: true }); } catch {} } +} +process.on('exit', ryd); +for (const [sig, nr] of [['SIGINT', 2], ['SIGTERM', 15], ['SIGHUP', 1]]) { + process.on(sig, () => { + ryd(); + // Har proeven selv en handler for signalet, faar den lov at afslutte; ellers goer vi. + if (process.listenerCount(sig) <= 1) process.exit(128 + nr); + }); +} diff --git a/test/samtidige-agenter.mjs b/test/samtidige-agenter.mjs index 5353b5c7..903e85e8 100644 --- a/test/samtidige-agenter.mjs +++ b/test/samtidige-agenter.mjs @@ -7,6 +7,7 @@ // // To rigtige servere, den rigtige hjaelper, og to usynlige proevevinduer // (uden titellinje, gennemsigtige, uden for skaermen - se proevemaal.swift). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync } from 'node:fs'; diff --git a/test/samtykke-tekst.mjs b/test/samtykke-tekst.mjs index a7270c39..937f9c77 100644 --- a/test/samtykke-tekst.mjs +++ b/test/samtykke-tekst.mjs @@ -10,6 +10,7 @@ // // Intet her viser en aegte dialog: spoergeren er en attrap der skriver den tekst // den fik, og hjaelperen er en attrap der intet goer. Svaret er «nej». +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { writeFileSync, chmodSync, mkdtempSync, rmSync } from 'node:fs'; diff --git a/test/sessionsport.mjs b/test/sessionsport.mjs index 26e77725..28b9a566 100644 --- a/test/sessionsport.mjs +++ b/test/sessionsport.mjs @@ -13,6 +13,7 @@ // // ⛔ Attrap-spoerger, saa ingen aegte dialog kan naa menneskets skaerm, og // attrap-hjaelper, saa intet udfoeres. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { join, dirname } from 'node:path'; diff --git a/test/skriv-ankommer.mjs b/test/skriv-ankommer.mjs index d14f5421..1c07a3fd 100644 --- a/test/skriv-ankommer.mjs +++ b/test/skriv-ankommer.mjs @@ -7,6 +7,7 @@ // var rød 2 af 5 gange på netop «teksten ankom» 25/9. // Nu skrives der i programmets fokuserede felt gennem tilgængeligheds-laget, og // feltet læses tilbage. Et kodeordsfelt tager aldrig den vej. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/stille-vej.mjs b/test/stille-vej.mjs index 7dbc065d..6dc5ef9e 100644 --- a/test/stille-vej.mjs +++ b/test/stille-vej.mjs @@ -34,6 +34,7 @@ // M2 took_screen altid falsk -> roed paa punkt 4 // M3 modtager() returnerer nil -> roed paa 1, 2 og 5, MEN ramte mennesket. // Gentag den ikke paa en maskine der er i brug. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/sync-tal-versioner.mjs b/test/sync-tal-versioner.mjs index f19aa31e..6cb4e98b 100644 --- a/test/sync-tal-versioner.mjs +++ b/test/sync-tal-versioner.mjs @@ -6,6 +6,7 @@ // sig. Tallet laeses nu fra den udgivne versions git-maerke; ukendt = intet tal. // // Koeres i en lokal klon (med maerker), saa intet i arbejdstraeet aendres. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync } from 'node:child_process'; import { mkdtempSync, readFileSync, writeFileSync, copyFileSync, rmSync } from 'node:fs'; import { join, dirname } from 'node:path'; diff --git a/test/tilladelser.mjs b/test/tilladelser.mjs index d9ab0125..65dc7e39 100644 --- a/test/tilladelser.mjs +++ b/test/tilladelser.mjs @@ -17,6 +17,7 @@ // Tilladelserne kan ikke fjernes paa menneskets maskine - det ville koste // ham hans egne. Saa hjaelperen erstattes af en attrap der svarer praecis // den fejlkode macOS ville udloese, og vi maaler hvad SERVEREN goer ved den. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { mkdtempSync, writeFileSync, chmodSync, rmSync } from 'node:fs'; diff --git a/test/tilstand-isoleret.mjs b/test/tilstand-isoleret.mjs index bb3ce5d5..314ffe2c 100644 --- a/test/tilstand-isoleret.mjs +++ b/test/tilstand-isoleret.mjs @@ -5,6 +5,7 @@ // hver fil der starter serveren, importerer egen-tilstand.mjs (eller er undtaget // med en grund og en bevist reserve), ingen fil SLETTER variablen, og run-all.sh // saetter selv en midlertidig mappe. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { readFileSync, readdirSync } from 'node:fs'; import { join, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; diff --git a/test/tilstede.mjs b/test/tilstede.mjs index 80d7574a..4f43b7e6 100644 --- a/test/tilstede.mjs +++ b/test/tilstede.mjs @@ -4,6 +4,7 @@ // intet om inputaktivitet, versioner eller hvad der blev vist. Proeven koerer en // rigtig server mod et FALSK ikon i en midlertidig mappe (aldrig menneskets // ikon.sock) og en falsk hjaelper hvis `idle` proeven selv bestemmer. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import './egen-tilstand.mjs'; import { spawn } from 'node:child_process'; import { createServer } from 'node:net'; diff --git a/test/touchid-manuel.mjs b/test/touchid-manuel.mjs index 712ca709..6f43c76a 100644 --- a/test/touchid-manuel.mjs +++ b/test/touchid-manuel.mjs @@ -10,6 +10,7 @@ // Den rigtige state-mappe bruges med vilje, saa spoergsmaalet lander i det // ikon mennesket allerede har. Agenten skriver i et usynligt proevevindue den // selv ejer - intet af menneskets programmer roeres. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { spawn, execFileSync } from 'node:child_process'; import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, existsSync, rmSync } from 'node:fs'; import { tmpdir, homedir } from 'node:os'; diff --git a/test/vaelger.mjs b/test/vaelger.mjs index c1048c3a..bed55092 100644 --- a/test/vaelger.mjs +++ b/test/vaelger.mjs @@ -8,6 +8,7 @@ // `set_value`, som overskriver tekst, må aldrig gætte med «det første». // // Kører på et prøvemål VI ejer (usynligt vindue uden for skærmen, se fixture). +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { execFileSync, spawn } from 'node:child_process'; import { existsSync, mkdtempSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; diff --git a/test/vagt.mjs b/test/vagt.mjs index 228134db..d8d8be41 100644 --- a/test/vagt.mjs +++ b/test/vagt.mjs @@ -14,6 +14,7 @@ // Det er et bedre signal end «lever klientens pid stadig», for et pid kan // genbruges af en fremmed proces. Proeve 5 og 6 koerer den aegte vej: et // barnebarn af en skal der doer. +import './ryd-op.mjs'; // 11/10: mapperne ryddes altid, ogsaa ved dumpet og afbrudt import { mkdtempSync, existsSync, readFileSync, writeFileSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { join, dirname } from 'node:path'; From df906cdda06bebde993c725b1d4c7115167b7a0c Mon Sep 17 00:00:00 2001 From: Gustav Louv Date: Mon, 12 Oct 2026 13:10:53 +0200 Subject: [PATCH 132/132] fix(ci): M9 peger paa boksens titel - ankeret forsvandt i 7bc3f41 (CI 38230972853) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit «Fremmed Mac» var annulleret paa hver 0.2.2-kandidat siden 9/10, saa ingen saa at M9's anker ("Needs you: click the orange menu bar icon") ikke fandtes mere. Nu mutereres boksens titel « needs you» (Tekst.swift); koert lokalt: roed paa 3c. Alle 11 ankre i mutant-giv-tilbage.sh findes praecis én gang. Co-Authored-By: Claude Opus 5.5 --- .github/mutant-giv-tilbage.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/mutant-giv-tilbage.sh b/.github/mutant-giv-tilbage.sh index aca1dec8..d0972378 100644 --- a/.github/mutant-giv-tilbage.sh +++ b/.github/mutant-giv-tilbage.sh @@ -55,8 +55,10 @@ FORVENTET='1 SIGUSR1' PROEVE=test/paste-stop.mjs MUT_FIL=Accessibility.swift mut FORVENTET='1 SIGUSR1' PROEVE=test/paste-stop.mjs MUT_FIL=Accessibility.swift mut M8-paste-hoerer-ikke-stop \ ' return sigismember(&s, SIGUSR1) == 1' ' return false' # M9 (30/9, live-proeven): boksen naevner ikke det ventende spoergsmaal -> 3c skal blive roed. +# 12/10: ankeret flyttet til boksens titel (Tekst.swift) - det gamle forsvandt i 7bc3f41, og ingen saa det, +# fordi «Fremmed Mac» var annulleret paa hver kandidat siden 9/10 (CI 38230972853 fandt det). FORVENTET=3c PROEVE=test/ikon-menu.mjs MUT_MAAL=cmcp-status MUT_FIL=Tekst.swift mut M9-boksen-tier-om-spoergsmaalet \ - '[antal == 1 ? "Needs you: click the orange menu bar icon"' '[antal == 1 ? "Computer MCP"' + 'titel: "\(renTekst(v.klient ?? "An agent")) needs you"' 'titel: "Computer MCP"' # M10 (1/10, konsulent-panelet): giv-tilbage river igen ethvert program tilbage - # ogsaa et der koerte i forvejen (= mennesket der skiftede skrivebord) -> 4 skal blive roed. FORVENTET='4 et program der koerte' mut M10-river-menneskets-skift-tilbage \