@vibe80/vibe80 0.2.1 → 0.2.2

package/client/src/App.jsx

@@ -172,6 +172,7 @@ const extractVibe80Blocks = (text, t = (value) => value) => {
       const trimmed = String(filePath || "").trim();
       if (trimmed) {
         filerefs.push(trimmed);
+        return `\`${trimmed.replace(/`/g, "\\`")}\``;
       }
       return "";
     })
@@ -662,6 +663,16 @@ function App() {
   const [sshKeyInput, setSshKeyInput] = useState("");
   const [httpUsername, setHttpUsername] = useState("");
   const [httpPassword, setHttpPassword] = useState("");
+  const [sessionConfigTargetId, setSessionConfigTargetId] = useState("");
+  const [sessionConfigAuthMode, setSessionConfigAuthMode] = useState("keep");
+  const [sessionConfigSshKey, setSessionConfigSshKey] = useState("");
+  const [sessionConfigHttpUsername, setSessionConfigHttpUsername] = useState("");
+  const [sessionConfigHttpPassword, setSessionConfigHttpPassword] = useState("");
+  const [sessionConfigInternetAccess, setSessionConfigInternetAccess] = useState(true);
+  const [sessionConfigDenyGitCredentialsAccess, setSessionConfigDenyGitCredentialsAccess] =
+    useState(false);
+  const [workspaceSessionUpdatingId, setWorkspaceSessionUpdatingId] = useState(null);
+  const [workspaceSessionConfigError, setWorkspaceSessionConfigError] = useState("");
   const [sessionMode, setSessionMode] = useState("new");
   const [annotationMode, setAnnotationMode] = useState(false);
   const [annotationsByScope, setAnnotationsByScope] = useState({});
@@ -1340,6 +1351,175 @@ function App() {
     setOpenAiLoginRequest,
   });
   const explorerStatusByPath = activeExplorer.statusByPath || {};
+  const sessionConfigTarget = useMemo(
+    () =>
+      Array.isArray(workspaceSessions)
+        ? workspaceSessions.find((item) => item?.sessionId === sessionConfigTargetId) || null
+        : null,
+    [workspaceSessions, sessionConfigTargetId]
+  );
+
+  const openSessionConfigure = useCallback(
+    (session) => {
+      const sessionId = session?.sessionId || "";
+      if (!sessionId) {
+        return;
+      }
+      setWorkspaceSessionConfigError("");
+      setSessionConfigTargetId(sessionId);
+      setSessionConfigAuthMode("keep");
+      setSessionConfigSshKey("");
+      setSessionConfigHttpUsername("");
+      setSessionConfigHttpPassword("");
+      setSessionConfigInternetAccess(
+        typeof session?.defaultInternetAccess === "boolean"
+          ? session.defaultInternetAccess
+          : true
+      );
+      setSessionConfigDenyGitCredentialsAccess(
+        typeof session?.defaultDenyGitCredentialsAccess === "boolean"
+          ? session.defaultDenyGitCredentialsAccess
+          : true
+      );
+    },
+    []
+  );
+
+  const closeSessionConfigure = useCallback(() => {
+    if (workspaceSessionUpdatingId) {
+      return;
+    }
+    setSessionConfigTargetId("");
+    setWorkspaceSessionConfigError("");
+    setSessionConfigAuthMode("keep");
+    setSessionConfigSshKey("");
+    setSessionConfigHttpUsername("");
+    setSessionConfigHttpPassword("");
+  }, [workspaceSessionUpdatingId]);
+
+  const handleUpdateSession = useCallback(async () => {
+    if (!sessionConfigTarget?.sessionId) {
+      return;
+    }
+    const sessionId = sessionConfigTarget.sessionId;
+    const payload = {};
+    if (sessionConfigInternetAccess !== Boolean(sessionConfigTarget?.defaultInternetAccess)) {
+      payload.defaultInternetAccess = sessionConfigInternetAccess;
+    }
+    if (
+      sessionConfigDenyGitCredentialsAccess
+      !== Boolean(sessionConfigTarget?.defaultDenyGitCredentialsAccess)
+    ) {
+      payload.defaultDenyGitCredentialsAccess = sessionConfigDenyGitCredentialsAccess;
+    }
+    if (sessionConfigAuthMode !== "keep") {
+      if (sessionConfigAuthMode === "ssh") {
+        const privateKey = sessionConfigSshKey.trim();
+        if (!privateKey) {
+          setWorkspaceSessionConfigError(t("Private SSH key is required."));
+          return;
+        }
+        payload.auth = { type: "ssh", privateKey };
+      } else if (sessionConfigAuthMode === "http") {
+        const username = sessionConfigHttpUsername.trim();
+        if (!username || !sessionConfigHttpPassword) {
+          setWorkspaceSessionConfigError(t("Username and password required."));
+          return;
+        }
+        payload.auth = {
+          type: "http",
+          username,
+          password: sessionConfigHttpPassword,
+        };
+      } else {
+        payload.auth = { type: "none" };
+      }
+    }
+    if (!Object.keys(payload).length) {
+      closeSessionConfigure();
+      return;
+    }
+    try {
+      setWorkspaceSessionUpdatingId(sessionId);
+      setWorkspaceSessionConfigError("");
+      const response = await apiFetch(
+        `/api/v1/sessions/${encodeURIComponent(sessionId)}`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload),
+        }
+      );
+      if (!response.ok) {
+        const err = await response.json().catch(() => null);
+        throw new Error(err?.error || t("Failed to update session."));
+      }
+      await response.json().catch(() => null);
+      await loadWorkspaceSessions();
+      showToast?.(t("Session updated."), "success");
+      setSessionConfigAuthMode("keep");
+      setSessionConfigSshKey("");
+      setSessionConfigHttpUsername("");
+      setSessionConfigHttpPassword("");
+      return { ok: true, sessionId };
+    } catch (error) {
+      setWorkspaceSessionConfigError(error.message || t("Failed to update session."));
+      return { ok: false, sessionId };
+    } finally {
+      setWorkspaceSessionUpdatingId(null);
+    }
+  }, [
+    apiFetch,
+    closeSessionConfigure,
+    loadWorkspaceSessions,
+    sessionConfigAuthMode,
+    sessionConfigDenyGitCredentialsAccess,
+    sessionConfigHttpPassword,
+    sessionConfigHttpUsername,
+    sessionConfigInternetAccess,
+    sessionConfigSshKey,
+    sessionConfigTarget,
+    showToast,
+    t,
+  ]);
+
+  const handleUpdateAndResumeSession = useCallback(async () => {
+    const sessionId = sessionConfigTarget?.sessionId || "";
+    if (!sessionId) {
+      return;
+    }
+    const result = await handleUpdateSession();
+    if (!result?.ok) {
+      return;
+    }
+    try {
+      setSessionRequested(true);
+      setAttachmentsError("");
+      const response = await apiFetch(
+        `/api/v1/sessions/${encodeURIComponent(sessionId)}`
+      );
+      if (!response.ok) {
+        const payload = await response.json().catch(() => null);
+        throw new Error(payload?.error || t("Unable to resume the session."));
+      }
+      const data = await response.json();
+      setAttachmentSession(data);
+      setSessionConfigTargetId("");
+    } catch (error) {
+      setWorkspaceSessionConfigError(
+        error?.message || t("Unable to resume the session.")
+      );
+      setSessionRequested(false);
+    }
+  }, [
+    apiFetch,
+    handleUpdateSession,
+    sessionConfigTarget?.sessionId,
+    setAttachmentSession,
+    setAttachmentsError,
+    setSessionRequested,
+    t,
+  ]);
   const explorerDirStatus = useMemo(() => {
     const dirStatus = {};
     const setStatus = (dirPath, type) => {
@@ -1441,7 +1621,6 @@ function App() {
     maybeNotify,
     normalizeAttachments,
     loadRepoLastCommit,
-    loadBranches,
     loadWorktreeLastCommit,
     openAiLoginRequest,
     setOpenAiLoginRequest,
@@ -1733,6 +1912,7 @@ function App() {
     openCloseConfirm,
     closeCloseConfirm,
     handleConfirmDelete,
+    closeConfirmDeleting,
   } = useWorktreeCloseConfirm({
     closeConfirm,
     setCloseConfirm,
@@ -2289,7 +2469,14 @@ function App() {
         workspaceSessions={workspaceSessions}
         workspaceSessionsError={workspaceSessionsError}
         workspaceSessionDeletingId={workspaceSessionDeletingId}
+        workspaceSessionConfigId={sessionConfigTargetId}
+        sessionConfigTarget={sessionConfigTarget}
+        workspaceSessionUpdatingId={workspaceSessionUpdatingId}
+        workspaceSessionConfigError={workspaceSessionConfigError}
         handleResumeSession={handleResumeSession}
+        openSessionConfigure={openSessionConfigure}
+        closeSessionConfigure={closeSessionConfigure}
+        handleUpdateAndResumeSession={handleUpdateAndResumeSession}
         handleDeleteSession={handleDeleteSession}
         locale={locale}
         extractRepoName={extractRepoName}
@@ -2314,6 +2501,18 @@ function App() {
         setDefaultInternetAccess={setDefaultInternetAccess}
         defaultDenyGitCredentialsAccess={defaultDenyGitCredentialsAccess}
         setDefaultDenyGitCredentialsAccess={setDefaultDenyGitCredentialsAccess}
+        sessionConfigAuthMode={sessionConfigAuthMode}
+        setSessionConfigAuthMode={setSessionConfigAuthMode}
+        sessionConfigSshKey={sessionConfigSshKey}
+        setSessionConfigSshKey={setSessionConfigSshKey}
+        sessionConfigHttpUsername={sessionConfigHttpUsername}
+        setSessionConfigHttpUsername={setSessionConfigHttpUsername}
+        sessionConfigHttpPassword={sessionConfigHttpPassword}
+        setSessionConfigHttpPassword={setSessionConfigHttpPassword}
+        sessionConfigInternetAccess={sessionConfigInternetAccess}
+        setSessionConfigInternetAccess={setSessionConfigInternetAccess}
+        sessionConfigDenyGitCredentialsAccess={sessionConfigDenyGitCredentialsAccess}
+        setSessionConfigDenyGitCredentialsAccess={setSessionConfigDenyGitCredentialsAccess}
         attachmentsError={attachmentsError}
         sessionRequested={sessionRequested}
         workspaceBusy={workspaceBusy}
@@ -3053,7 +3252,7 @@ function App() {
           className="worktree-close-confirm-overlay"
           role="dialog"
           aria-modal="true"
-          onClick={closeCloseConfirm}
+          onClick={closeConfirmDeleting ? undefined : closeCloseConfirm}
         >
           <div
             className="worktree-close-confirm-dialog"
@@ -3068,6 +3267,7 @@ function App() {
                 className="worktree-close-confirm-close"
                 aria-label={t("Close")}
                 onClick={closeCloseConfirm}
+                disabled={closeConfirmDeleting}
               >
                 <FontAwesomeIcon icon={faXmark} />
               </button>
@@ -3080,6 +3280,7 @@ function App() {
                 type="button"
                 className="worktree-close-confirm-cancel"
                 onClick={closeCloseConfirm}
+                disabled={closeConfirmDeleting}
               >
                 {t("Cancel")}
               </button>
@@ -3087,6 +3288,7 @@ function App() {
                 type="button"
                 className="worktree-close-confirm-delete"
                 onClick={handleConfirmDelete}
+                disabled={closeConfirmDeleting}
               >
                 {t("Delete worktree")}
               </button>

package/client/src/components/Chat/ChatMessages.jsx

@@ -610,7 +610,7 @@ export default function ChatMessages({
                           ) : (
                             content
                           )}
-                          {filerefs.length ? (
+                          {filerefs.length && !message?.isStreaming ? (
                             <ul className="fileref-list">
                               {filerefs.map((pathRef) => (
                                 <li