trip-moments-skill 1.1.2 → 1.3.0

package/.agents/skills/trip-moments/scripts/agent_transport.py

@@ -355,7 +355,9 @@ def _claw_module():
 
 
 class OpenClawTransport:
-    """Persistent-session transport over ClawHive's chat-completions endpoint.
+    """Persistent-session transport over an OpenClaw gateway's chat-completions
+    endpoint — either ClawHive's embedded gateway or the OpenClaw desktop app's
+    WSL-backed one (both are `openclaw`, discovered by clawbridge).
 
     The gateway serves ONE turn per session lane (#235): `start()` is a full
     blocking agent turn, not a run-id handle. We still model it as
@@ -366,6 +368,13 @@ class OpenClawTransport:
     """
 
     provider = "openclaw"
+    # The WSL gateway's session book is SQLite inside the distro and the wsl$
+    # UNC paths are unreachable from Windows, so there is no "the conversation
+    # the user is looking at" to bind to there. This explicit key gives the
+    # workbench one stable thread instead: the gateway routes it to a session of
+    # its own (only `subagent:`/`cron:`/`acp:` are reserved) and repeated turns
+    # continue that conversation rather than starting fresh each time.
+    WORKBENCH_SESSION = "studio-workbench"
 
     def __init__(self, cwd=""):
         self.claw = _claw_module()
@@ -378,28 +387,45 @@ class OpenClawTransport:
     def probe(self):
         info = self.claw.discover(force=True)
         if not info.get("base"):
-            raise AgentError("未找到运行中的 ClawHive gateway：" + (info.get("why") or ""))
+            # A gateway that answered but has the opt-in endpoint disabled is NOT
+            # the same as no gateway: say which one it was and what to turn on,
+            # otherwise the only message the user gets is 「未找到」 while their
+            # OpenClaw is sitting right there on 18789.
+            why = info.get("why") or ""
+            if info.get("via"):
+                raise AgentError(f"{info.get('name') or 'OpenClaw'} 通道不可用：{why}")
+            raise AgentError("未找到运行中的 OpenClaw gateway：" + why)
         if not info.get("enabled"):
-            raise AgentError("ClawHive gateway 的 OpenAI 兼容端点未启用：" + (info.get("why") or ""))
+            raise AgentError("OpenClaw gateway 的 OpenAI 兼容端点未启用：" + (info.get("why") or ""))
         return {"ready": True, "provider": self.provider, "native_sessions": True,
                 "streaming": False, "steer": False, "approvals": False,
-                "port": info.get("port"), "agents": info.get("agents") or []}
+                "port": info.get("port"), "agents": info.get("agents") or [],
+                "gateway": info.get("name") or "", "via": info.get("via") or ""}
 
     def sessions(self):
-        # The desktop conversation list belongs to ClawHive's own UI; offering
+        # The desktop conversation list belongs to that app's own UI; offering
         # it here would invite binding to a session nobody is looking at.
         return []
 
     def create(self, title, cwd):
-        # There is no session-creation endpoint: we bind to the conversation
-        # the user has open right now (see bind).
+        # There is no session-creation endpoint on this API surface; the bind
+        # below decides which thread turns will land in.
         return ""
 
     def bind(self, sid):
-        key = sid or self.claw.active_session()
-        if not key:
-            raise AgentError("没有找到正在使用的 ClawHive 会话；先在 ClawHive 里打开一个对话")
-        return key
+        if sid:
+            return sid
+        key = self.claw.active_session()
+        if key:
+            return key                       # ClawHive: the open conversation
+        info = self.claw.discover()
+        if info.get("via"):
+            # Keyed off `via`, not `base`: a gateway that ANSWERED but has the
+            # endpoint disabled is still a gateway (that is the default state),
+            # and probe() already refused with the exact config key before we get
+            # here. Binding then succeeds and the first turn reports the truth.
+            return self.WORKBENCH_SESSION     # WSL gateway: our own thread
+        raise AgentError("没有找到正在使用的 ClawHive 会话；先在 ClawHive 里打开一个对话")
 
     # -- turns ---------------------------------------------------------------
     def start(self, sid, text, key):

package/.agents/skills/trip-moments/scripts/agent_ui.py

@@ -28,18 +28,51 @@ AGENT_STYLES = r"""
 .ap-compose textarea{width:100%;min-height:65px;max-height:160px;resize:vertical;padding:9px;border:1px solid var(--line-2);border-radius:7px;font-size:12px}
 .ap-compose .row{margin-top:8px}.ap-compose .btn{white-space:normal}
 .ap-next{width:100%;margin-top:8px}
-.workflow-control{padding:13px;border:1px solid var(--line-2);border-radius:9px;background:var(--card);margin-bottom:13px}
-.workflow-control h3{font-size:12px;margin-bottom:8px}
-.workflow-mode{display:grid;grid-template-columns:1fr 1fr;gap:5px}
+.workflow-mode{display:grid;grid-template-columns:1fr 1fr;gap:5px;min-width:0}
 .workflow-mode button{padding:8px 5px;border:1px solid var(--line-2);border-radius:6px;background:var(--paper-hi);cursor:pointer;font-size:11px}
 .workflow-mode button.on{background:var(--navy);border-color:var(--navy);color:#fff}
-.workflow-control .row{margin-top:9px}.workflow-control .row .btn{flex:1}
-.workflow-control .note{margin-top:8px}
-.agent-workflow{border:1px solid #cbd7c8;border-radius:9px;background:var(--card);margin:12px 0;overflow:hidden}
-.agent-workflow>header{padding:10px 12px;border-bottom:1px solid var(--line);font-size:12px;font-weight:600}
-.agent-workflow .ap-stream{padding:10px;max-height:360px;overflow:auto}
-.agent-workflow .ap-status{margin:0 0 8px}
-.agent-workflow .ap-compose{padding:10px}
+/* ---- the per-step action deck -------------------------------------------
+   写要求 → 点按钮 → 看结果 in one card. Before this the request box sat in the
+   middle card, the trigger at the top of the rail and the result at the bottom,
+   and five labels told the user to click 「上方」. */
+.deck{border:1px solid var(--line-2);border-radius:10px;background:var(--card);margin-bottom:13px;overflow:hidden}
+.deck-h{display:flex;align-items:center;gap:8px;padding:10px 12px;border-bottom:1px solid var(--line);
+  background:linear-gradient(120deg,#f7f5ee,#eef2ee)}
+.deck-t{font-size:12px;font-weight:600}.deck-s{font-size:10px;color:var(--sub);text-align:right}
+.deck-ctl{padding:10px 12px 2px}
+.deck-row{display:flex;align-items:center;gap:9px;margin-bottom:8px}
+.deck-k{font-size:10.5px;color:var(--sub);flex:none;width:52px}
+.deck-row>.workflow-mode{flex:1}
+.deck-row select{flex:1;min-width:0;padding:7px;border:1px solid var(--line-2);border-radius:6px;background:#fff;font-size:11px}
+.deck-ctl #wf-mode-note{margin:0 0 10px}
+.deck-write{padding:0 12px}
+.deck-write .pref-grid{margin-top:2px}
+.deck-write .cp-actions{display:flex;gap:6px;flex-wrap:wrap;margin-bottom:8px}
+.deck-write .cp-actions button{font-size:11px;padding:6px 10px;border:1px solid #becdbb;border-radius:6px;
+  background:#f4f8f2;color:#2c4a37;cursor:pointer;transition:all .16s var(--ease)}
+.deck-write .cp-actions button:hover{background:#fff;transform:translateY(-1px)}
+.deck-l{display:block;font-size:10.5px;color:var(--sub);margin:2px 0 5px}
+.deck-write textarea{width:100%;min-height:62px;max-height:170px;resize:vertical;padding:9px;font-size:12px;
+  border:1px solid var(--line-2);border-radius:7px;background:#fff;font-family:inherit}
+.deck-go{display:flex;gap:7px;flex-wrap:wrap;padding:10px 12px 0}
+.deck-go .btn{white-space:normal}
+.deck-go #wf-work{flex:1;min-width:120px}
+.deck-go .note{margin:0}
+#wf-connection{margin:8px 12px 0}
+#wf-connection:empty{display:none}
+.deck-brief{margin:9px 12px 0;border:1px solid var(--line);border-radius:7px;background:var(--paper-hi)}
+.deck-brief>summary{font-size:10.5px;color:var(--sub);padding:8px 10px;cursor:pointer}
+.deck-brief pre{white-space:pre-wrap;overflow-wrap:anywhere;font:10.5px/1.65 var(--mono);color:var(--ink-2);
+  max-height:300px;overflow:auto;padding:0 10px 9px;margin:0}
+.deck-out{padding:11px 12px 12px;border-top:1px solid var(--line);margin-top:11px}
+.deck-out-h{display:flex;align-items:center;gap:8px;font-size:10px;color:var(--sub);
+  text-transform:uppercase;letter-spacing:.08em;margin-bottom:8px}
+.deck-out-h .sp{flex:1}.deck-out-s{font-size:10px;color:var(--sub);text-transform:none;letter-spacing:0}
+.deck-out .ai-out:empty{margin:0}
+.deck-agent{border-top:1px dashed var(--line-2);padding:11px 12px 12px;background:#fbfcfa}
+.deck-agent .ap-stream{max-height:340px;overflow:auto}
+.deck-agent .ap-status{margin:0 0 8px}
+.deck .proposal-card{margin:0 0 9px}
 @media(max-width:720px){.agent-panel{top:8px;bottom:8px;right:8px;width:calc(100vw - 16px)}}
 """
 
@@ -50,7 +83,7 @@ AGENT_SHELL = r"""
  <div class="ap-body" id="ap-body">
   <details class="ap-setup" id="ap-setup" open><summary>连接与会话绑定</summary>
    <label for="ap-kind">Agent 通道</label><select id="ap-kind" onchange="agentProviderHint()">
-    <option value="hermes">Hermes · 原生持续会话</option><option value="codex">Codex App Server · 工作台专用会话</option><option value="openclaw">OpenClaw (ClawHive) · 活跃会话直连</option></select>
+    <option value="hermes">Hermes · 原生持续会话</option><option value="codex">Codex App Server · 工作台专用会话</option><option value="openclaw">OpenClaw gateway · 整轮直连（ClawHive 或 WSL）</option></select>
    <div id="ap-hermes-fields"><label for="ap-url">本机 Hermes API 地址</label><input id="ap-url" value="http://127.0.0.1:8642">
     <label for="ap-key">API 密钥（留空读取本机 Hermes 配置）</label><input id="ap-key" type="password" autocomplete="off"></div>
    <p class="note" id="ap-hint" style="margin-top:8px"></p>
@@ -73,57 +106,71 @@ AGENT_SHELL = r"""
 AGENT_SCRIPT = r"""
 const AP = { open: false, data: null, polling: false, timer: null, seq: -1, pending: false, draft: "", answers: {} };
 function useAgentModel() { return S.data?.preferences?.ai_mode === "agent"; }
-function workflowControlsHtml() {
+/* The deck's control rows. No trigger button here any more: the deck owns the
+   写要求 → 点按钮 → 看结果 order, so the button sits under the input box. */
+function deckControlsHtml() {
   const agent = useAgentModel();
-  const labels = { select:"智能选片", crop:"生成构图方案", grade:"生成调色方案",
-    retouch:"开始修图", finish:"生成所选作品", caption:"生成 3 版文案" };
-  return `<section class="workflow-control"><h3>本步由谁处理</h3>
-    <div class="workflow-mode" role="group" aria-label="AI 执行来源">
-      <button class="${agent ? "" : "on"}" aria-pressed="${!agent}" data-ai-mode="gateway">模型网关</button>
-      <button class="${agent ? "on" : ""}" aria-pressed="${agent}" data-ai-mode="agent">Agent 自带模型</button>
-    </div>
-    <p class="note" id="wf-mode-note">${agent ? "使用已绑定 Agent 的模型、工具与会话上下文。" : "使用配置的模型网关；AI 分析会发送照片预览，不进入 Agent 会话。"}</p>
-    ${S.step === "finish" ? `<label class="note" for="finish-mode">本次制作</label>
-      <select id="finish-mode" style="width:100%;padding:7px;border:1px solid var(--line-2);border-radius:6px">
-        <option value="art" ${S.finishMode !== "local" ? "selected" : ""}>AI 艺术作品 · 使用所选模型来源</option>
-        <option value="local" ${S.finishMode === "local" ? "selected" : ""}>本地画板／九宫格 · 不调用模型</option>
-      </select><p class="note">在下方选择风格或版式，再点击「生成所选作品」。此步不打包。</p>` : ""}
-    ${["crop","grade"].includes(S.step) ? `<label class="note" for="wf-scope">处理范围</label>
-      <select id="wf-scope" style="width:100%;padding:7px;border:1px solid var(--line-2);border-radius:6px">
-        <option value="current" ${S.aiScope !== "all" ? "selected" : ""}>当前第 ${S.sel} 格</option>
+  const sel = S.sel != null ? S.sel : 1;
+  return `<div class="deck-ctl">
+    <div class="deck-row"><span class="deck-k">谁来做</span>
+      <div class="workflow-mode" role="group" aria-label="AI 执行来源">
+        <button class="${agent ? "" : "on"}" aria-pressed="${!agent}" data-ai-mode="gateway">模型网关</button>
+        <button class="${agent ? "on" : ""}" aria-pressed="${agent}" data-ai-mode="agent">Agent 自带模型</button>
+      </div></div>
+    ${["crop","grade"].includes(S.step) ? `<div class="deck-row"><span class="deck-k">处理范围</span>
+      <select id="wf-scope" aria-label="处理范围">
+        <option value="current" ${S.aiScope !== "all" ? "selected" : ""}>当前第 ${sel} 格</option>
         <option value="all" ${S.aiScope === "all" ? "selected" : ""}>全部已选照片</option>
-      </select>` : ""}
-    <div class="row"><button class="btn btn-sm" id="wf-review" onclick="runCurrentStep('review')">检查本步</button>
-      <button class="btn btn-sm btn-ai" id="wf-work" onclick="runCurrentStep('work')">${labels[S.step] || "处理本步"}</button></div>
-    <p class="note" id="wf-connection" ${agent ? "" : 'style="display:none"'}>${agent ? "连接状态正在同步…" : ""}</p>
-    ${agent ? `<button class="btn btn-sm ghost" onclick="openAgentPanel()">管理 Agent 连接</button>` : ""}
-  </section>`;
+      </select></div>` : ""}
+    ${S.step === "finish" ? `<div class="deck-row"><span class="deck-k">本次制作</span>
+      <select id="finish-mode" aria-label="本次制作方式">
+        <option value="art" ${S.finishMode !== "local" ? "selected" : ""}>AI 艺术作品 · 用所选模型来源</option>
+        <option value="local" ${S.finishMode === "local" ? "selected" : ""}>本地画板／九宫格 · 不调模型</option>
+      </select></div>` : ""}
+    <p class="note" id="wf-mode-note">${agent
+      ? "用已绑定 Agent 的模型、工具与会话上下文；检查、处理、追问都在本卡完成。"
+      : "用配置的模型网关；AI 分析会发送照片预览，不进入 Agent 会话。"}</p>
+    <p class="note" id="claw-note" style="display:none"></p>
+  </div>`;
+}
+/* One input box serves both 「本步要求」 and 「继续追问」, so the session buttons
+   live next to the trigger instead of under a second textarea. */
+function deckSessionButtons() {
+  const active = !!AP.pending || !!(AP.data && AP.data.active);
+  if (active) {
+    return `<button class="btn btn-sm" id="ap-steer" onclick="controlAgent('steer')">补充到当前执行</button>
+      <button class="btn btn-sm ghost" id="ap-stop" onclick="controlAgent('stop')">停止本轮</button>`;
+  }
+  return `<button class="btn btn-sm" id="ap-send" onclick="sendAgentReply()">继续对话</button>`;
 }
-function agentWorkflowHtml() {
+function agentStreamHtml() {
   if (!useAgentModel()) return "";
-  return `<section class="agent-workflow" aria-label="当前步骤的 Agent 协作">
-    <header>本步回复与反馈 · 同一会话</header>
+  return `<div class="deck-agent">
+    <div class="deck-out-h"><span>Agent 会话</span><span class="sp"></span>
+      <span class="deck-out-s">同一会话 · 回复不会自动跳步</span></div>
     <div class="ap-stream" id="ap-stream">
       <div class="ap-status" id="ap-run-status">正在读取绑定会话…</div>
       <div id="ap-messages"></div><div id="ap-live" class="ap-live" style="display:none" role="status"></div>
       <div id="ap-approval"></div>
       <details class="ap-tools"><summary>本轮真实工具事件</summary><div id="ap-events"></div></details>
     </div>
-    <div class="ap-compose">
-      <textarea id="ap-input" placeholder="继续追问、补充要求，或确认采用刚才的方案。仍然进入同一个 Agent 会话。" aria-label="给绑定 Agent 的回复">${H(AP.draft)}</textarea>
-      <div class="row"><button class="btn btn-sm btn-primary" id="ap-send" onclick="sendAgentReply()">继续对话</button>
-        <button class="btn btn-sm" id="ap-steer" onclick="controlAgent('steer')">补充到当前执行</button>
-        <button class="btn btn-sm ghost" id="ap-stop" onclick="controlAgent('stop')">停止本轮</button></div>
-      <button class="btn btn-sm ghost" style="margin-top:6px" onclick="syncAgentHistory()">同步会话回复</button>
-      <p class="note" style="margin-top:6px">收到回复不会自动跳步。确认完成后，再使用本步底部的「进入下一步」。</p>
-    </div></section>`;
+    <div class="row" style="margin-top:7px">
+      <button class="btn btn-sm ghost" onclick="syncAgentHistory()">同步会话回复</button>
+      <button class="btn btn-sm ghost" onclick="openAgentPanel()">管理 Agent 连接</button>
+    </div>
+  </div>`;
+}
+function deckInput() { return $("deck-intent"); }
+function deckInputText() {
+  const el = deckInput();
+  return el ? el.value.trim() : (S.copilotIntent || "").trim();
 }
 function startAgentPolling() {
   if (!AP.timer) AP.timer = setInterval(() => {
     if (AP.open || useAgentModel() || AP.data?.active) pollAgent();
   }, 850);
 }
-function wireWorkflow() {
+function wireDeckControls() {
   const finishMode = $("finish-mode");
   if (finishMode) finishMode.addEventListener("change", () => {
     S.finishMode = finishMode.value;
@@ -132,8 +179,6 @@ function wireWorkflow() {
   document.querySelectorAll("[data-ai-mode]").forEach(el => el.addEventListener("click", () => setAIMode(el.dataset.aiMode)));
   const scope = $("wf-scope");
   if (scope) scope.addEventListener("change", () => { S.aiScope = scope.value; });
-  const input = $("ap-input");
-  if (input) input.addEventListener("input", () => { AP.draft = input.value; });
   if (useAgentModel()) {
     startAgentPolling();
     AP.seq = -1; AP.approvalId = null;
@@ -187,7 +232,7 @@ async function runCurrentStep(kind) {
   if (useAgentModel()) {
     if (kind === "review") {
       if (!await requireAgentConnection()) return;
-      return sendAgentMessage("review_step", $("cp-intent")?.value || "", S.step);
+      return sendAgentMessage("review_step", deckInputText(), S.step);
     }
     if (S.step === "retouch") return aiEdit();
     const operation = { select:"select9", crop:"compose", grade:S.aiScope === "all" ? "grade_all" : "grade_plan", retouch:"edit", finish:"finish", caption:"caption" }[S.step];
@@ -231,7 +276,7 @@ function agentProviderHint() {
     ? "绑定 Hermes 原生会话，后续回复与步骤按钮都延续该会话。连接密钥仅由本机服务使用。"
     : kind === "codex"
     ? "使用本机已登录的 Codex CLI，创建工作台专用的持续任务；不接管你当前 Codex 桌面聊天。工具批准仍需你确认。"
-    : "直连 ClawHive 内嵌的 OpenClaw gateway，绑定你正在看的那个会话；整轮执行，无中间批准。需在 openclaw.json 启用 chatCompletions 端点。";
+    : "直连 OpenClaw gateway —— ClawHive 内嵌的那个，或 OpenClaw 桌面版在 WSL 里跑的那个。整轮执行，无中间批准；需在该 gateway 的 openclaw.json 里启用 chatCompletions 端点。ClawHive 上会绑定你正在看的会话；WSL gateway 读不到会话簿，改用工作台专用会话。";
 }
 async function pollAgent() {
   if (AP.polling) return;
@@ -355,25 +400,31 @@ async function sendAgentMessage(action, message, step = S.step, options = {}) {
   try {
     const data = await post("/api/agent/send", { ...options, action, message, step, slot: S.sel });
     if (!data.ok) { toast(data.error, "err", 6500); return false; }
-    AP.draft = ""; if ($("ap-input")) $("ap-input").value = ""; pollJobs(); pollAgent();
+    AP.draft = "";
+    const el = deckInput();
+    if (el) el.value = "";
+    S.copilotIntent = "";
+    (S.copilotDrafts = S.copilotDrafts || {})[copilotDraftKey()] = "";
+    S.deckBrief = "";
+    pollJobs(); pollAgent();
     return true;
   } finally { AP.pending = false; }
 }
 function sendAgentStep(action) {
-  return sendAgentMessage(action, ($("ap-input")?.value || AP.draft).trim());
+  return sendAgentMessage(action, deckInputText());
 }
 function sendAgentReply() {
-  const text = ($("ap-input")?.value || AP.draft).trim();
+  const text = deckInputText();
   if (!text) { toast("请写下本轮回复或修改要求"); return; }
   return sendAgentMessage("", text);
 }
 async function controlAgent(action, answers) {
-  const text = ($("ap-input")?.value || AP.draft).trim();
+  const text = deckInputText();
   if (action === "steer" && !text) { toast("请先写下要补充的要求"); return; }
   const data = await post("/api/agent/control", { action, text, answers,
     run_id: AP.data?.run_id, request_id: AP.data?.approval?.request_id });
   if (!data.ok) { toast(data.error, "err"); return; }
-  if (action === "steer") { AP.draft = ""; if ($("ap-input")) $("ap-input").value = ""; }
+  if (action === "steer") { AP.draft = ""; const el = deckInput(); if (el) el.value = ""; }
   pollAgent();
 }
 function answerAgent() {