drafted 1.19.28 → 1.19.30

package/mcp/server.mjs

@@ -3262,13 +3262,37 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       {
         const orgs = await getOrgList();
         if (searchNeedsOrg({ explicitOrg: org, orgFromPath, orgCount: orgs.length })) {
-          const names = orgs.map(o => o.slug || o.name || o.id).filter(Boolean);
+          // Work is almost always org-specific, and this session usually already
+          // knows WHICH — a binding, an open project, or the linked repo of the
+          // checkout you are sitting in. Refusing to SCOPE by that is the whole
+          // point (it would be silent); refusing to NAME it is just unhelpful.
+          // So lead with the likely answer and make the retry a copy-paste.
+          let likelyId = workingOrgId();
+          if (!likelyId) {
+            // workingOrgId()'s repo rung is populated as a SIDE EFFECT of whoami,
+            // so a session that searches before calling it gets no hint — and the
+            // guard fires early, which makes that the common case, not the edge.
+            // Resolve it here instead of depending on call order. getRepoAddress
+            // is process-cached, so this costs nothing after the first hit.
+            const addrNow = await getRepoAddress().catch(() => null);
+            if (addrNow?.state === 'linked' && addrNow.orgId) {
+              getSessionState().repoOrgId = addrNow.orgId;   // and stop re-resolving
+              likelyId = addrNow.orgId;
+            }
+          }
+          const likely = likelyId ? orgs.find(o => o.id === likelyId) : null;
+          const addr = (o) => o.slug || o.name || o.id;
+          const others = orgs.filter(o => o.id !== likelyId).map(addr).filter(Boolean);
           return err(new Error(
-            `Which org? Search needs one, and you belong to ${orgs.length}: ${names.join(', ')}.\n` +
-            `An unaddressed search would scope to whichever org this session inherited and report ` +
-            `"no matches" for the others — a false negative you cannot see, which is worse than this error.\n` +
-            `Address the org in the PATH: fs(search, path="/o/<org>", query="${q}").\n` +
-            `(Or org="<name>" on this call. Searching several orgs = one call each; the results say which org they came from.)`
+            (likely
+              ? `Which org? Search will not guess. This session is working in "${addr(likely)}" (source: ${workingOrgSource()}) — if that is what you meant, say so:\n` +
+                `  fs(search, path="/o/${addr(likely)}", query="${q}")\n` +
+                `Your other ${others.length} org(s): ${others.join(', ')}.\n`
+              : `Which org? Search needs one, and you belong to ${orgs.length}: ${others.join(', ')}.\n` +
+                `  fs(search, path="/o/<org>", query="${q}")\n`) +
+            `Naming it is not overhead — a search that quietly scoped itself reports "no matches" for every ` +
+            `org it skipped, which is indistinguishable from "nowhere" and stops you looking.\n` +
+            `(Or org="<name>" on this call. Several orgs = one call each; every result says which org it came from.)`
           ));
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.19.28",
+  "version": "1.19.30",
   "description": "Drafted — visual thinking surface for humans and AI agents. Renders HTML, markdown, images, and code as frames on a zoomable canvas, with MCP tools for AI agents and real-time sync for humans.",
   "type": "module",
   "files": [