@miadi/connector 0.1.24 → 0.1.26

package/README.md

@@ -126,6 +126,8 @@ The drafter gets two rounds: a report and a revision, twice. The third report's
 
 In a client that renders MCP Apps (ChatGPT among them), `show_decisions` draws one card per request awaiting a decision: what is asked, by whom, and what approving does. The person decides on the card with their own click: Approve, Approve with my changes, Send back for revision, or Decline. The card then shows the receipt.
 
+A new card address needs a new URI, and the earlier ones stay readable (`DECISIONS_CARD_EARLIER_URIS`). A host keeps the tool metadata it read until its connection is refreshed by hand, and draws an empty card for a template it cannot read. The journal holds one line for each `show_decisions` call and each template read (`card_template_read`), so a blank card can be told from a card nobody asked for.
+
 A decision is recorded once. An approved run that calls another service (a review operation, Deep Diver, an episode door, a steer) is written to the ledger as approved and running before the call, so a restart can never offer the request for a second approval; a run the connector was recording when it stopped reads as failed and may be run again. A decision whose run takes longer than `MIADI_CONNECTOR_DECISION_WAIT_MS` is answered as recorded and running, and the card reads `get_run_result` every 3 seconds until the outcome is in. The same decision sent again (a host retrying a call, a second click, the page form sent twice) answers with the first one's receipt, marked `replayed`, and runs nothing. A different decision is refused as `decision_conflict`, with where the request stands. When the host gives up on a call, the card reads where the request stands before it offers the buttons again.
 
 **A created review gets its transcript (jgwill/Miadi#925).** An approved `create` calls the review service, then reads the video's original-language YouTube captions with a local `uvx yt-dlp` and stores them on the review as `[mm:ss] text`, so an agent reads them through `fetch` and the factory's kind briefs find them with `miadi_review.py transcript`. No model is called for the transcript. The service answers an empty `POST /api/reviews/:id/transcript` by asking Gemini, so an empty one is never sent. `completion_receipt.transcript` says where it stands, and the card and the approval page say the same:

package/dist/approve.js

@@ -403,7 +403,7 @@ blockquote{margin:.2rem 0 .6rem;padding-left:.8rem;border-left:2px solid var(--l
 @media (prefers-color-scheme:dark){.err{color:#ff8a80}}
 </style></head><body><main>${body}</main></body></html>`;
 }
-function summary(r) {
+function summary(r, o = {}) {
     const shown = { ...r.body };
     for (const k of ["markdown", "transcript"])
         if (typeof shown[k] === "string")
@@ -414,7 +414,7 @@ function summary(r) {
 <dt>By</dt><dd>${escapeHtml(r.actor.name)}${r.actor.client_name ? ` through ${escapeHtml(r.actor.client_name)}` : ""}</dd>
 <dt>When</dt><dd>${escapeHtml(r.created_at)}</dd>
 ${r.circle ? `<dt>Circle</dt><dd>${escapeHtml(r.circle)}</dd>` : ""}
-${r.intention ? `<dt>Intention</dt><dd>${escapeHtml(r.intention)}</dd>` : ""}
+${r.intention && o.intention !== false ? `<dt>Intention</dt><dd>${escapeHtml(r.intention)}</dd>` : ""}
 ${r.refs.length ? `<dt>References</dt><dd>${r.refs.map(escapeHtml).join("<br>")}</dd>` : ""}
 <dt>State</dt><dd>${escapeHtml(r.approval_state ?? "—")}</dd>
 ${versionOf(r) > 1 ? `<dt>Version</dt><dd>${versionOf(r)}, the one a decision here decides. Earlier versions stay in the ledger.</dd>` : ""}
@@ -831,6 +831,8 @@ export function registerApprovalRoutes(app, deps) {
         }
         if (!person)
             return void res.status(401).type("html").send(signInToRead(r, "Miadi did not recognise that person token."));
+        // What the page was sent, for the journal: signing in and deciding look alike from the person's side (jgwill/Miadi#939).
+        logDecision(deps, { phase: "page_post", record: r.id, decision: String(body.decision ?? "") || null, approval_state: r.approval_state });
         const writer = person.api_tier === "write";
         if (!writer && r.actor.person_id !== person.id) {
             return void res.status(403).type("html").send(signInToRead(r, `Reading and deciding this request needs Miadi's write tier; ${person.name} has ${person.api_tier ?? "no API tier"}.`));
@@ -984,14 +986,14 @@ function signInToRead(r, error) {
     // The label names no one and no instruction: this page is shown before sign-in.
     const open = r.approval_state === "awaiting_approval";
     const label = projectRequest(r, { recording: isBeingDecided(r.id) })?.label ?? r.approval_state ?? "";
-    return page(open ? "A Miadi request awaits a decision" : "A Miadi request was decided", `<h1>${open ? "A request awaits a decision" : "A request was decided"}</h1>
+    return page(open ? "A Miadi request awaits a decision" : "A Miadi request was decided", `<h1>${open ? "Sign in to read this request" : "A request was decided"}</h1>
 <p>${escapeHtml(KIND_LABELS[r.kind] ?? r.kind)}, asked ${escapeHtml(r.created_at.slice(0, 16).replace("T", " "))} UTC. ${escapeHtml(label)}.</p>
-<p>${open ? "Sign in to read it. A person with Miadi's write tier then decides; whoever asked can read it." : "Sign in to read what was decided and what came of it. Whoever asked, and anyone with Miadi's write tier, can read it."}</p>
+<p>${open ? "Signing in approves nothing. The next page shows the request, and a person with Miadi's write tier decides there. Whoever asked can read it." : "Sign in to read what was decided and what came of it. Whoever asked, and anyone with Miadi's write tier, can read it."}</p>
 ${error ? `<p class="err" role="alert">${escapeHtml(error)}</p>` : ""}
 <form method="post">
 <label for="t">Your Miadi person token</label>
 <input id="t" name="person_token" type="password" autocomplete="off" required>
-<div class="row"><button class="primary" type="submit">Read the request</button></div>
+<div class="row"><button class="primary" type="submit">Sign in and read the request</button></div>
 </form>`);
 }
 /** The request, and the decision form for a write-tier person (their token carried in the form they just signed into). */
@@ -1081,12 +1083,20 @@ function approvePage(deps, r, o = {}) {
     // Freshness binds a decision still to come; a decided run shows the authorization it holds (#926 review R1).
     const authorization = r.kind === "run_request" ? authorizeProvider(r, deps.ledger.all(), { requireFresh: open }) : undefined;
     const blocked = Boolean(authorization && !authorization.authorized);
-    return page("Approve a Miadi request", `<h1>${open ? "Approve a request" : "A decided request"}</h1>
+    // Signed in and able to decide: the decision comes before the record's details, and no line says it waits for someone else.
+    const canDecideHere = Boolean(actionable && o.token);
+    const heading = canDecideHere ? "Not approved yet: decide here" : open ? "A request awaiting a decision" : (projectionOf(r, deps)?.label ?? "A decided request");
+    const details = canDecideHere
+        ? `<details><summary>What exactly is asked</summary>${summary(r, { intention: false })}</details>`
+        : `${summary(r)}
+${open ? draftReviewSection(r, deps.draftReview?.stored(r), false) : ""}
+${projectionBlock(projectionOf(r, deps), open ? undefined : r.completion_receipt)}`;
+    return page("Approve a Miadi request", `<h1>${escapeHtml(heading)}</h1>
+${canDecideHere ? `<p>You are signed in. Nothing is approved until you press a button below.</p>` : ""}
 ${actionable ? `<p>${escapeHtml(consequenceOf(r, authorization, current(deps.ledger.all())))} Declining records your refusal. Either is kept in the ledger with your name.</p>` : ""}
+${canDecideHere && r.intention ? `<p><strong>Intention:</strong> ${escapeHtml(r.intention)}</p>` : ""}
 ${authorization ? providerSection(r, authorization, actionable ? o.chooserToken : undefined) : ""}
-${summary(r)}
-${open ? draftReviewSection(r, deps.draftReview?.stored(r), Boolean(actionable && o.token && !blocked)) : ""}
-${projectionBlock(projectionOf(r, deps), open ? undefined : r.completion_receipt)}
+${canDecideHere ? draftReviewSection(r, deps.draftReview?.stored(r), !blocked) : ""}
 ${o.error ? `<p class="err" role="alert">${escapeHtml(o.error)}</p>` : ""}
 ${actionable && o.token
         ? `<form method="post">
@@ -1111,7 +1121,8 @@ ${blocked
 <form method="post">
 <input type="hidden" name="person_token" value="${escapeHtml(o.token)}">
 <div class="row"><button class="primary" type="submit" name="decision" value="rerun">Run it again</button></div></form>`
-                    : ""}`);
+                    : ""}
+${details}`);
 }
 /**
  * Which provider a run launches with, who chose it, and, when the requester's own choice is

package/dist/decisions.d.ts

@@ -1,4 +1,10 @@
 export declare const DECISIONS_CARD_URI = "ui://miadi/decisions-v2.html";
+/**
+ * Addresses the card had before. Every one stays readable, because a host keeps the tool metadata it read
+ * until the connection is refreshed by hand, and it renders nothing for a template it cannot read: removing
+ * v1 in 0.1.22 left ChatGPT drawing an empty card (jgwill/Miadi#939).
+ */
+export declare const DECISIONS_CARD_EARLIER_URIS: string[];
 /** The default lifetime of a card's decision token, in seconds; MIADI_CONNECTOR_DECISION_TOKEN_TTL changes it. */
 export declare const DECISION_TOKEN_TTL: number;
 /** Where the tokens travel in a result's `_meta`, keyed by record id. */

package/dist/decisions.js

@@ -25,6 +25,12 @@ import { join } from "node:path";
 import { newSecret } from "./store.js";
 import { DEFAULT_DECISION_TOKEN_TTL } from "./config.js";
 export const DECISIONS_CARD_URI = "ui://miadi/decisions-v2.html";
+/**
+ * Addresses the card had before. Every one stays readable, because a host keeps the tool metadata it read
+ * until the connection is refreshed by hand, and it renders nothing for a template it cannot read: removing
+ * v1 in 0.1.22 left ChatGPT drawing an empty card (jgwill/Miadi#939).
+ */
+export const DECISIONS_CARD_EARLIER_URIS = ["ui://miadi/decisions-v1.html"];
 /** The default lifetime of a card's decision token, in seconds; MIADI_CONNECTOR_DECISION_TOKEN_TTL changes it. */
 export const DECISION_TOKEN_TTL = DEFAULT_DECISION_TOKEN_TTL;
 /** Where the tokens travel in a result's `_meta`, keyed by record id. */

package/dist/server.js

@@ -5,7 +5,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { mcpAuthRouter, createOAuthMetadata, getOAuthProtectedResourceMetadataUrl } from "@modelcontextprotocol/sdk/server/auth/router.js";
 import { requireBearerAuth } from "@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js";
 import { MiadiOAuthProvider, SCOPES, SCOPE_CONTRIBUTE, SCOPE_READ, emptyOAuthState } from "./oauth.js";
-import { reconcileInterrupted, registerApprovalRoutes, registerProviderPolicyRoutes, startTranscriptSettling } from "./approve.js";
+import { logDecision, reconcileInterrupted, registerApprovalRoutes, registerProviderPolicyRoutes, startTranscriptSettling } from "./approve.js";
 import { DecisionTokens } from "./decisions.js";
 import { JsonFile, Ledger, ensureStateDir, statePaths } from "./store.js";
 import { registerTools } from "./tools.js";
@@ -107,6 +107,12 @@ export function createConnectorApp(config, deps) {
         bearer(req, res, next);
     };
     const handle = async (req, res) => {
+        // What a host asks for to draw the card, for the journal: a blank card is otherwise invisible from here (jgwill/Miadi#939).
+        const rpc = (req.body ?? {});
+        if (rpc.method === "resources/read")
+            logDecision(approvalDeps, { phase: "card_template_read", uri: String(rpc.params?.uri ?? "").slice(0, 120) });
+        if (rpc.method === "tools/call" && rpc.params?.name === "show_decisions")
+            logDecision(approvalDeps, { phase: "show_decisions" });
         const ctx = {
             config,
             miadi,

package/dist/tools.js

@@ -18,7 +18,7 @@ import { CIRCLES, CIRCLE_IDS, CLAIM_CATEGORIES, DOMAINS, HANDOFF_STATES, current
 import { VERSION } from "./version.js";
 import { AlreadyDecided, DECISIONS, DecisionConflict, KIND_LABELS, ProviderChoiceRequired, STILL_RUNNING, StaleVersion, approvalStateOf, consequenceOf, decide, decisionWaitOf, isApprovable, isBeingDecided, logDecision, readQueueState, requestProjection, settleWithin, } from "./approve.js";
 import { RevisionRefused, requestHistory, revisionRecord, supersedeRecords, versionOf } from "./revisions.js";
-import { DECISIONS_CARD_HTML, DECISIONS_CARD_URI, DECISION_TOKENS_META } from "./decisions.js";
+import { DECISIONS_CARD_EARLIER_URIS, DECISIONS_CARD_HTML, DECISIONS_CARD_URI, DECISION_TOKENS_META } from "./decisions.js";
 import { discoverProviders, jevConfigOf, resolveProvider, routerPreflight, PROVIDERS } from "./providers.js";
 import { authorizesActions, missionStatus, primaryIssueOf, resolveMissionSubject } from "./mission-status.js";
 import { authorizationReceipt, authorizeProvider, CHOICE_PROVIDERS, isPersonId, needsPersonChoice, providerPolicyOf } from "./provider-policy.js";
@@ -2256,16 +2256,18 @@ export function registerTools(server, ctx) {
                 shown[k] = `${shown[k].length} chars`;
         return JSON.stringify({ ...shown, refs: r.refs.length ? r.refs : undefined }, null, 2);
     };
-    server.registerResource("miadi-decisions-card", DECISIONS_CARD_URI, { title: "Miadi decisions", description: "Requests awaiting a person's decision, decided by the person's own click.", mimeType: "text/html;profile=mcp-app" }, async () => ({
-        contents: [
-            {
-                uri: DECISIONS_CARD_URI,
-                mimeType: "text/html;profile=mcp-app",
-                text: DECISIONS_CARD_HTML,
-                _meta: { ui: { prefersBorder: true, csp: { connectDomains: [], resourceDomains: [] } }, "openai/widgetDescription": "Cards for the requests awaiting the person's decision." },
-            },
-        ],
-    }));
+    for (const uri of [DECISIONS_CARD_URI, ...DECISIONS_CARD_EARLIER_URIS]) {
+        server.registerResource(uri === DECISIONS_CARD_URI ? "miadi-decisions-card" : `miadi-decisions-card-${uri.replace(/\W+/g, "-")}`, uri, { title: "Miadi decisions", description: "Requests awaiting a person's decision, decided by the person's own click.", mimeType: "text/html;profile=mcp-app" }, async () => ({
+            contents: [
+                {
+                    uri,
+                    mimeType: "text/html;profile=mcp-app",
+                    text: DECISIONS_CARD_HTML,
+                    _meta: { ui: { prefersBorder: true, csp: { connectDomains: [], resourceDomains: [] } }, "openai/widgetDescription": "Cards for the requests awaiting the person's decision." },
+                },
+            ],
+        }));
+    }
     server.registerTool("show_decisions", {
         title: "Show the requests awaiting a decision",
         description: "Show the requests that await a person's decision (runs, work proposals, review operations, Deep Diver, episode links, session endings) as cards in the conversation. The person approves, approves with changes, sends back or declines each one with their own click; you cannot decide for them. Call it after making a request, or when the person asks what waits for them. Optionally pass record_id to show one request.",

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.24";
+export declare const VERSION = "0.1.26";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "0.1.24";
+export const VERSION = "0.1.26";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miadi/connector",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "The Miadi connector: one remote MCP service through which a person signed in with their Miadi person token, from ChatGPT or any MCP client, reads sessions, reviews, episodes and circles and records observations, inquiries, handoffs and proposals with their name on each record.",
   "license": "MIT",
   "author": "Miadi",