npm - @wipcomputer/wip-ldm-os - Versions diffs - 0.4.85-alpha.3 → 0.4.85-alpha.4 - Mend

@wipcomputer/wip-ldm-os 0.4.85-alpha.3 → 0.4.85-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/package.json +4 -1
package/scripts/test-crc-agentid-tenant-boundary.mjs +72 -0
package/scripts/test-crc-e2ee-session-route.mjs +122 -0
package/scripts/test-crc-pair-login-flow.mjs +40 -0
package/src/hosted-mcp/app/footer.js +74 -0
package/src/hosted-mcp/app/kaleidoscope-login.html +843 -0
package/src/hosted-mcp/app/pair.html +147 -57
package/src/hosted-mcp/app/sprites.png +0 -0
package/src/hosted-mcp/demo/index.html +3 -7
package/src/hosted-mcp/demo/login.html +318 -20
package/src/hosted-mcp/deploy.sh +306 -56
package/src/hosted-mcp/nginx/codex-relay.conf +25 -0
package/src/hosted-mcp/nginx/conf.d/redact-logs.conf +60 -0
package/src/hosted-mcp/nginx/mcp-oauth.conf +58 -0
package/src/hosted-mcp/nginx/wip.computer.conf +25 -1
package/src/hosted-mcp/scripts/audit-logs.sh +205 -0
package/src/hosted-mcp/scripts/verify-deploy.sh +102 -0
package/src/hosted-mcp/server.mjs +775 -112

package/src/hosted-mcp/app/pair.html CHANGED Viewed

@@ -13,13 +13,21 @@
     --accent: #0033FF;
     --input-bg: #F5F3ED;
     --input-border: #E0DDD6;
+    --card-bg: #FFFFFF;
     --font: -apple-system, BlinkMacSystemFont, "SF Pro Text", system-ui, sans-serif;
   }
   html, body { height: 100%; font-family: var(--font); background: var(--bg); color: var(--text); }
   .page { display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 100vh; padding: 24px; }
   .card { max-width: 420px; width: 100%; text-align: center; }
   h1 { font-size: 26px; font-weight: 600; letter-spacing: -0.02em; margin-bottom: 8px; }
-  .sub { font-size: 16px; color: var(--text-muted); margin-bottom: 32px; }
+  .sub { font-size: 16px; color: var(--text-muted); margin-bottom: 24px; }
+  .code-display {
+    font-family: ui-monospace, "SF Mono", monospace;
+    font-size: 28px; font-weight: 600; letter-spacing: 0.3em;
+    background: var(--card-bg); border: 1px solid var(--input-border);
+    border-radius: 12px; padding: 18px;
+    margin: 0 auto 20px; display: inline-block; min-width: 240px;
+  }
   input[type="text"] {
     width: 100%; padding: 18px; font-size: 22px; font-weight: 600;
     text-align: center; letter-spacing: 0.4em;
@@ -28,9 +36,10 @@
     text-transform: uppercase; font-family: ui-monospace, "SF Mono", monospace;
   }
   input[type="text"]:focus { border-color: var(--accent); outline: none; }
-  .btn { display: block; width: 100%; padding: 18px; border: none; border-radius: 12px; font-size: 18px; font-weight: 600; font-family: var(--font); cursor: pointer; margin-top: 16px; }
+  .btn { display: block; width: 100%; padding: 18px; border: none; border-radius: 12px; font-size: 18px; font-weight: 600; font-family: var(--font); cursor: pointer; margin-top: 12px; }
   .btn:active { transform: scale(0.98); }
   .btn-primary { background: var(--accent); color: white; }
+  .btn-secondary { background: var(--card-bg); color: var(--text-muted); border: 1px solid var(--input-border); }
   .btn:disabled { opacity: 0.5; cursor: not-allowed; }
   .status { margin-top: 18px; font-size: 14px; min-height: 1.4em; color: var(--text-muted); }
   .status.error { color: #b00020; }
@@ -41,78 +50,159 @@
 <body>
 <div class="page">
   <div class="card">
-    <h1>Pair your Mac</h1>
-    <div class="sub">Type the code printed by <code>codex-daemon link</code></div>
-    <input id="codeInput" type="text" maxlength="6" autocomplete="off" autocapitalize="characters" inputmode="text" placeholder="ABC123">
-    <button id="pairBtn" class="btn btn-primary" type="button">Pair</button>
-    <div id="status" class="status"></div>
-    <div class="footer">Signed in as <span id="handle">...</span> ... <a href="#" id="signout">sign out</a></div>
+    <!-- View 1: confirm pair (when URL has a valid code + user is signed in) -->
+    <div id="confirm-view" style="display: none;">
+      <h1>Pair this laptop with Codex Remote Control?</h1>
+      <div class="sub">A device wants to drive its local Codex session from your phone.</div>
+      <div class="code-display" id="confirm-code">______</div>
+      <button id="confirmBtn" class="btn btn-primary" type="button">Confirm</button>
+      <button id="cancelBtn" class="btn btn-secondary" type="button">Cancel</button>
+      <div id="status" class="status"></div>
+      <div class="footer">Signed in as <span id="handle">...</span></div>
+    </div>
+    <!-- View 2: manual code entry (fallback for bare /pair) -->
+    <div id="manual-view" style="display: none;">
+      <h1>Pair your laptop</h1>
+      <div class="sub">Type the 6-character code printed by <code>codex-daemon link</code></div>
+      <input id="codeInput" type="text" maxlength="6" autocomplete="off" autocapitalize="characters" inputmode="text" placeholder="ABCDEF">
+      <button id="manualBtn" class="btn btn-primary" type="button">Pair</button>
+      <div id="manualStatus" class="status"></div>
+      <div class="footer">Signed in as <span id="manualHandle">...</span></div>
+    </div>
+    <!-- View 3: success -->
+    <div id="success-view" style="display: none;">
+      <h1>Paired.</h1>
+      <div class="sub">Your laptop will pick this up in a few seconds.</div>
+      <div class="footer">You can close this tab.</div>
+    </div>
   </div>
 </div>
 <script>
-function getApiKey() {
-  return sessionStorage.getItem("wip_api_key");
-}
-function getHandle() {
-  return sessionStorage.getItem("wip_handle") || "(unknown)";
-}
-function setStatus(msg, kind) {
-  const el = document.getElementById("status");
+// Real daemon alphabet: A-Z minus I and O, digits 2-9. L IS included.
+// Length 6. Per CODEX_PAIR_ALPHABET in server.mjs and plan C1+C3 round 5.
+var PAIR_CODE_REGEX = /^[ABCDEFGHJKLMNPQRSTUVWXYZ23456789]{6}$/;
+function getApiKey() { return sessionStorage.getItem('wip_api_key'); }
+function getHandle() { return sessionStorage.getItem('wip_handle') || '(unknown)'; }
+function setStatus(elId, msg, kind) {
+  var el = document.getElementById(elId);
   el.textContent = msg;
-  el.className = "status" + (kind ? " " + kind : "");
-}
-function ensureSignedIn() {
-  if (!getApiKey()) {
-    location.href = "/app/login.html?next=" + encodeURIComponent("/pair");
-    return false;
-  }
-  document.getElementById("handle").textContent = getHandle();
-  return true;
+  el.className = 'status' + (kind ? ' ' + kind : '');
 }
-document.getElementById("signout").addEventListener("click", (ev) => {
-  ev.preventDefault();
-  sessionStorage.removeItem("wip_api_key");
-  sessionStorage.removeItem("wip_handle");
-  location.href = "/app/login.html?next=" + encodeURIComponent("/pair");
-});
+// Read the code from /pair/<CODE>. Returns null if path is bare /pair or
+// the code doesn't match the daemon alphabet. Defense-in-depth: server
+// validates authoritatively via its route regex.
+function readCodeFromPath() {
+  var m = location.pathname.match(/^\/pair\/([A-Za-z0-9]+)\/?$/);
+  if (!m) return null;
+  var raw = m[1].trim().toUpperCase();
+  return PAIR_CODE_REGEX.test(raw) ? raw : null;
+}
-async function pair() {
-  const input = document.getElementById("codeInput");
-  const code = input.value.trim().toUpperCase();
-  if (code.length !== 6) {
-    setStatus("Enter the 6-character code shown on your Mac.", "error");
-    return;
+// POST the code to /api/codex-relay/pair-complete using the api_key
+// from sessionStorage as Bearer token. On success, show the success view.
+async function submitPair(code, statusElId) {
+  if (!PAIR_CODE_REGEX.test(code)) {
+    setStatus(statusElId, 'That does not look like a valid code.', 'error');
+    return false;
   }
-  const btn = document.getElementById("pairBtn");
-  btn.disabled = true;
-  setStatus("Pairing...");
+  setStatus(statusElId, 'Pairing...', '');
   try {
-    const res = await fetch("/api/codex-relay/pair-complete", {
-      method: "POST",
+    var res = await fetch('/api/codex-relay/pair-complete', {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
-        "Authorization": "Bearer " + getApiKey(),
+        'Content-Type': 'application/json',
+        'Authorization': 'Bearer ' + getApiKey(),
       },
-      body: JSON.stringify({ code }),
+      body: JSON.stringify({ code: code }),
     });
-    const data = await res.json();
-    if (!res.ok) throw new Error(data.error || "Pairing failed");
-    setStatus("Paired. Your Mac will pick this up in a few seconds.", "success");
-    btn.textContent = "Done";
+    var data = await res.json();
+    if (!res.ok) {
+      var msg = (data && data.error) || 'Pairing failed.';
+      // If the code expired or was already used, suggest rerunning the daemon.
+      if (res.status === 410 || res.status === 404) {
+        msg += ' Run codex-daemon link again on your laptop to get a fresh code.';
+      }
+      setStatus(statusElId, msg, 'error');
+      return false;
+    }
+    document.getElementById('confirm-view').style.display = 'none';
+    document.getElementById('manual-view').style.display = 'none';
+    document.getElementById('success-view').style.display = 'block';
+    return true;
   } catch (err) {
-    setStatus(err.message || String(err), "error");
-    btn.disabled = false;
+    setStatus(statusElId, (err && err.message) || String(err), 'error');
+    return false;
   }
 }
-if (ensureSignedIn()) {
-  document.getElementById("pairBtn").addEventListener("click", pair);
-  document.getElementById("codeInput").addEventListener("keydown", (ev) => {
-    if (ev.key === "Enter") pair();
+// ── Routing ──
+//
+// 1. If not signed in: redirect to /login?next=<this-path-with-code>.
+//    The existing Kaleidoscope login flow will QR + passkey + redirect
+//    back here. The server's `next` whitelist also enforces this shape.
+// 2. If signed in AND URL has a valid code: render the confirm view.
+//    User must tap Confirm before we POST pair-complete (per plan C7).
+// 3. If signed in but no code in URL (bare /pair): render the manual
+//    entry view. Fallback only.
+(function init() {
+  var code = readCodeFromPath();
+  var apiKey = getApiKey();
+  if (!apiKey) {
+    // Not signed in. Send through /login keeping the current path as next.
+    var nextParam = encodeURIComponent(location.pathname);
+    location.replace('/login?next=' + nextParam);
+    return;
+  }
+  if (code) {
+    // Signed in + URL has a valid code. Show confirm step.
+    var confirmView = document.getElementById('confirm-view');
+    document.getElementById('confirm-code').textContent = code;
+    document.getElementById('handle').textContent = getHandle();
+    confirmView.style.display = 'block';
+    document.getElementById('confirmBtn').addEventListener('click', async function() {
+      var confirmBtn = document.getElementById('confirmBtn');
+      var cancelBtn = document.getElementById('cancelBtn');
+      confirmBtn.disabled = true;
+      cancelBtn.disabled = true;
+      var ok = await submitPair(code, 'status');
+      // On failure, re-enable Confirm/Cancel so the user can retry or cancel.
+      // Server may have rejected the code as expired or already-used; the
+      // user should see the error and have the buttons back.
+      if (!ok) {
+        confirmBtn.disabled = false;
+        cancelBtn.disabled = false;
+      }
+    });
+    document.getElementById('cancelBtn').addEventListener('click', function() {
+      // Best-effort: just close the tab if we can; otherwise redirect home.
+      try { window.close(); } catch (e) {}
+      setTimeout(function() { location.replace('/'); }, 100);
+    });
+    return;
+  }
+  // Bare /pair, signed in. Manual code entry fallback.
+  var manualView = document.getElementById('manual-view');
+  document.getElementById('manualHandle').textContent = getHandle();
+  manualView.style.display = 'block';
+  function manualSubmit() {
+    var raw = document.getElementById('codeInput').value.trim().toUpperCase();
+    submitPair(raw, 'manualStatus');
+  }
+  document.getElementById('manualBtn').addEventListener('click', manualSubmit);
+  document.getElementById('codeInput').addEventListener('keydown', function(ev) {
+    if (ev.key === 'Enter') manualSubmit();
   });
-  document.getElementById("codeInput").focus();
-}
+  document.getElementById('codeInput').focus();
+})();
 </script>
 </body>
 </html>

package/src/hosted-mcp/app/sprites.png ADDED Viewed

Binary file

package/src/hosted-mcp/demo/index.html CHANGED Viewed

@@ -1233,13 +1233,9 @@ if (sessionStorage.getItem('lesa-token')) {
   showChat();
 }
-// If user has an account (created at /login), show sign-in mode
-if (localStorage.getItem('kscope-has-account') && !sessionStorage.getItem('lesa-token')) {
-  document.getElementById('createBtn').textContent = 'Enter the Kaleidoscope';
-  document.getElementById('createBtn').onclick = function() { doSignIn(); };
-  document.getElementById('handleInputWrap').style.display = 'none';
-  document.getElementById('signInBtn').parentElement.style.display = 'none';
-}
+// /demo/ always shows the original create-account UI. Do not key off
+// localStorage["kscope-has-account"] to swap into sign-in mode here;
+// that coupled /login state to /demo/ rendering.
 // Handle send (not used in demo flow, but wired up)
 function handleSend() {