fix: tighten advisor command routing

Co-authored-by: Codex <noreply@openai.com>

hackathon_advisor/model_runtime.py

@@ -75,13 +75,53 @@ class RuleBasedPlanner:
             output = '<function name="list_projects">{"sort":"likes"}</function>'
         elif project_id:
             output = f'<function name="get_project">{{"id":{_json_string(project_id)}}}</function>'
-        elif _has_command_term(lower, ("compare", "choose", "rank")):
+        elif _matches_command(lower, ("compare", "compare ideas", "choose", "rank", "rank ideas")):
             output = '<function name="compare_ideas">{}</function>'
-        elif _has_command_term(lower, ("plan", "roadmap", "next step", "milestone")):
+        elif _matches_command(
+            lower,
+            (
+                "plan",
+                "make a plan",
+                "make a build plan",
+                "draft a plan",
+                "draft a build plan",
+                "build plan",
+                "roadmap",
+                "next step",
+                "milestone",
+            ),
+        ):
             output = '<function name="make_plan">{}</function>'
-        elif _has_command_term(lower, ("whitespace", "original", "new", "bolder", "unwritten", "gap")):
+        elif _matches_command(
+            lower,
+            (
+                "gap",
+                "find gap",
+                "find a gap",
+                "find whitespace",
+                "write bolder",
+                "bolder",
+                "unwritten",
+                "make it more original",
+                "new direction",
+            ),
+        ):
             output = '<function name="find_whitespace">{}</function>'
-        elif _has_command_term(lower, ("search", "similar", "already", "existing", "overlap", "echo")):
+        elif _matches_command(
+            lower,
+            (
+                "search",
+                "search for",
+                "find similar",
+                "similar",
+                "is this already",
+                "already built",
+                "check overlap",
+                "overlap",
+                "show echoes",
+                "echo",
+            ),
+        ):
             output = f'<function name="search_projects">{{"query":{_json_string(text)}}}</function>'
         else:
             title, pitch = idea_from_text(text)
@@ -412,11 +452,8 @@ def _wants_project_list(lower_text: str) -> bool:
     return lower_text in exact_phrases or any(lower_text.startswith(prefix) for prefix in command_prefixes)
 
 
-def _has_command_term(lower_text: str, terms: tuple[str, ...]) -> bool:
-    return any(
-        re.search(rf"(?<![a-z0-9]){re.escape(term)}(?![a-z0-9])", lower_text)
-        for term in terms
-    )
+def _matches_command(lower_text: str, phrases: tuple[str, ...]) -> bool:
+    return lower_text in phrases or any(lower_text.startswith(f"{phrase} ") for phrase in phrases)
 
 
 def _project_reference_id(text: str) -> str:

static/app.js

@@ -89,6 +89,8 @@ document.querySelectorAll("[data-command]").forEach((button) => {
   });
 });
 
+setupMenus();
+
 demoButton.addEventListener("click", async () => {
   await loadDemoSession();
 });
@@ -1204,6 +1206,37 @@ function clearTurnWatchdog() {
   }
 }
 
+function setupMenus() {
+  document.querySelectorAll(".menu").forEach((menu) => {
+    const trigger = menu.querySelector(".menu-trigger");
+    const list = menu.querySelector(".menu-list");
+    if (!trigger || !list) return;
+    trigger.addEventListener("click", (event) => {
+      event.stopPropagation();
+      const willOpen = list.hidden;
+      closeAllMenus();
+      if (willOpen) {
+        list.hidden = false;
+        trigger.setAttribute("aria-expanded", "true");
+      }
+    });
+    list.addEventListener("click", () => closeAllMenus()); // selecting an item closes the menu
+  });
+  document.addEventListener("click", () => closeAllMenus());
+  document.addEventListener("keydown", (event) => {
+    if (event.key === "Escape") closeAllMenus();
+  });
+}
+
+function closeAllMenus() {
+  document.querySelectorAll(".menu-list").forEach((list) => {
+    list.hidden = true;
+  });
+  document.querySelectorAll(".menu-trigger").forEach((trigger) => {
+    trigger.setAttribute("aria-expanded", "false");
+  });
+}
+
 // Coarse overall completion per stage, so the bar always advances even when token-level
 // progress is unknown (e.g. the rules backend, or the fast tool/writing stages).
 const STAGE_PROGRESS = { planning: 8, running_tool: 85, writing: 95 };

static/index.html

@@ -132,91 +132,76 @@
               </div>
 
               <div class="toolbar command-row" aria-label="Advisor commands">
-                <button id="submit" class="btn btn-ink" type="submit" title="Score this idea">
+                <button id="submit" class="btn btn-ink" type="submit" title="Score this idea against the map">
                   <svg class="icon"><use href="#icon-quill"></use></svg>
-                  Ink
-                </button>
-                <button
-                  type="button"
-                  class="btn"
-                  data-command="write bolder and find whitespace"
-                  title="Find an under-explored direction"
-                >
-                  <svg class="icon"><use href="#icon-gap"></use></svg>
-                  Gap
-                </button>
-                <button
-                  type="button"
-                  class="btn"
-                  data-command="make a build plan"
-                  title="Draft a build plan for the current idea"
-                >
-                  <svg class="icon"><use href="#icon-plan"></use></svg>
-                  Plan
-                </button>
-                <button
-                  type="button"
-                  class="btn"
-                  data-command="compare ideas"
-                  title="Compare saved ideas"
-                >
-                  <svg class="icon"><use href="#icon-rank"></use></svg>
-                  Compare
+                  Score idea
                 </button>
+
+                <div class="menu" data-menu="actions">
+                  <button
+                    type="button"
+                    id="actions-trigger"
+                    class="btn menu-trigger"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                    title="More advisor actions"
+                  >
+                    Actions
+                    <span class="caret" aria-hidden="true">▾</span>
+                  </button>
+                  <div class="menu-list" id="actions-menu" role="menu" hidden>
+                    <button type="button" class="menu-item" role="menuitem" data-command="write bolder and find whitespace">
+                      <svg class="icon"><use href="#icon-gap"></use></svg>
+                      <span class="mi-text"><strong>Find a gap</strong><small>An under-explored direction to try</small></span>
+                    </button>
+                    <button type="button" class="menu-item" role="menuitem" data-command="make a build plan">
+                      <svg class="icon"><use href="#icon-plan"></use></svg>
+                      <span class="mi-text"><strong>Make a plan</strong><small>Draft build steps for the current idea</small></span>
+                    </button>
+                    <button type="button" class="menu-item" role="menuitem" data-command="compare ideas">
+                      <svg class="icon"><use href="#icon-rank"></use></svg>
+                      <span class="mi-text"><strong>Compare ideas</strong><small>Rank the ideas on your board</small></span>
+                    </button>
+                  </div>
+                </div>
+
                 <span class="spacer"></span>
-                <button
-                  type="button"
-                  id="load-demo"
-                  class="btn btn-ghost"
-                  title="Load a sample session"
-                  aria-label="Load example idea board"
-                >
-                  <svg class="icon"><use href="#icon-example"></use></svg>
-                  Example
-                </button>
-                <button
-                  type="button"
-                  id="export-notes"
-                  class="btn btn-ghost"
-                  title="Export build notes"
-                  aria-label="Export build notes"
-                  disabled
-                >
-                  <svg class="icon"><use href="#icon-download"></use></svg>
-                  Notes
-                </button>
-                <button
-                  type="button"
-                  id="export-chapter"
-                  class="btn btn-ghost"
-                  title="Export the idea-board chapter"
-                  aria-label="Export idea-board chapter"
-                  disabled
-                >
-                  <svg class="icon"><use href="#icon-download"></use></svg>
-                  Chapter
-                </button>
-                <button
-                  type="button"
-                  id="export-artifact"
-                  class="btn btn-ghost"
-                  title="Export the current page"
-                  aria-label="Export current page as PNG"
-                  disabled
-                >
-                  <svg class="icon"><use href="#icon-download"></use></svg>
-                  PNG
-                </button>
-                <button
-                  type="button"
-                  id="reset-session"
-                  class="btn btn-ghost btn-icon"
-                  title="Reset the session"
-                  aria-label="Reset session"
-                >
-                  <svg class="icon"><use href="#icon-reset"></use></svg>
-                  <span class="sr-only">Reset</span>
-                </button>
+
+                <div class="menu" data-menu="more">
+                  <button
+                    type="button"
+                    id="more-trigger"
+                    class="btn btn-ghost menu-trigger btn-icon"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                    title="Export and session options"
+                    aria-label="More options"
+                  >
+                    <span class="caret-dots" aria-hidden="true">⋯</span>
+                  </button>
+                  <div class="menu-list menu-list-right" id="more-menu" role="menu" hidden>
+                    <button type="button" id="load-demo" class="menu-item" role="menuitem" aria-label="Load example idea board">
+                      <svg class="icon"><use href="#icon-example"></use></svg>
+                      Example board
+                    </button>
+                    <button type="button" id="export-notes" class="menu-item" role="menuitem" aria-label="Export build notes" disabled>
+                      <svg class="icon"><use href="#icon-download"></use></svg>
+                      Build notes
+                    </button>
+                    <button type="button" id="export-chapter" class="menu-item" role="menuitem" aria-label="Export idea-board chapter" disabled>
+                      <svg class="icon"><use href="#icon-download"></use></svg>
+                      Chapter
+                    </button>
+                    <button type="button" id="export-artifact" class="menu-item" role="menuitem" aria-label="Export current page as PNG" disabled>
+                      <svg class="icon"><use href="#icon-download"></use></svg>
+                      Page PNG
+                    </button>
+                    <button type="button" id="reset-session" class="menu-item menu-item-danger" role="menuitem" aria-label="Reset session">
+                      <svg class="icon"><use href="#icon-reset"></use></svg>
+                      Reset session
+                    </button>
+                  </div>
+                </div>
               </div>
             </form>
 

static/styles.css

@@ -1402,3 +1402,97 @@ textarea:disabled {
     transform: translateY(0);
   }
 }
+
+/* Action / overflow menus (consolidate secondary buttons) */
+.menu {
+  position: relative;
+  display: inline-flex;
+}
+
+.menu-trigger .caret {
+  margin-left: 4px;
+  font-size: 0.72em;
+}
+
+.menu-trigger[aria-expanded="true"] {
+  border-color: var(--ink-faint);
+}
+
+.caret-dots {
+  font-size: 1.05rem;
+  line-height: 1;
+  letter-spacing: 1px;
+}
+
+.menu-list {
+  position: absolute;
+  top: calc(100% + 6px);
+  left: 0;
+  z-index: 30;
+  min-width: 210px;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 5px;
+  background: var(--paper-3);
+  border: 1px solid var(--edge);
+  border-radius: 9px;
+  box-shadow: 0 12px 30px -12px rgba(0, 0, 0, 0.45);
+}
+
+.menu-list[hidden] {
+  display: none;
+}
+
+.menu-list-right {
+  left: auto;
+  right: 0;
+}
+
+.menu-item {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  width: 100%;
+  padding: 8px 10px;
+  border: 0;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--ink);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+  transition: background 0.15s ease;
+}
+
+.menu-item:hover:not(:disabled),
+.menu-item:focus-visible:not(:disabled) {
+  background: rgba(73, 49, 22, 0.09);
+  outline: none;
+}
+
+.menu-item:disabled {
+  opacity: 0.42;
+  cursor: default;
+}
+
+.menu-item .icon {
+  flex: 0 0 auto;
+  color: var(--ink-soft);
+}
+
+.menu-item .mi-text {
+  display: flex;
+  flex-direction: column;
+  line-height: 1.25;
+}
+
+.menu-item .mi-text small {
+  color: var(--ink-faint);
+  font-size: 0.72em;
+}
+
+.menu-item-danger:hover:not(:disabled) {
+  background: rgba(154, 43, 34, 0.1);
+  color: var(--oxblood);
+}

tests/test_model_runtime.py

@@ -97,13 +97,19 @@ def test_rule_planner_keeps_project_words_inside_ideas() -> None:
 def test_rule_planner_does_not_match_commands_inside_idea_words() -> None:
     planner = RuleBasedPlanner()
 
-    resolution = planner.plan(
+    planting = planner.plan(
         "A neighborhood seed swap archive that reminds gardeners when to plant shared seeds",
         {},
     )
+    cooking_plan = planner.plan(
+        "A countertop helper that turns pantry leftovers into a weekly cooking plan",
+        {},
+    )
 
-    assert resolution.status == "valid"
-    assert resolution.call.name == "save_idea"
+    assert planting.status == "valid"
+    assert planting.call.name == "save_idea"
+    assert cooking_plan.status == "valid"
+    assert cooking_plan.call.name == "save_idea"
 
 
 def test_rule_planner_splits_explicit_idea_pitch() -> None: