Compare commits

...

3 Commits

Author SHA1 Message Date
Jiayuan
eed41083cf fix(daemon): preserve existing GIT_CONFIG_* entries in gitEnv
Instead of resetting GIT_CONFIG_COUNT to 1, read the existing count
from the environment and append safe.directory at the next available
index. This preserves any env-scoped git config (auth, URL rewrites,
extra headers) injected into the daemon process.

Adds TestGitEnvPreservesExistingConfig to verify the append behavior.

Co-authored-by: multica-agent <github@multica.ai>
2026-05-01 16:10:09 +02:00
Jiayuan
798d16edf2 fix(daemon): add safe.directory=* to gitEnv to fix CI dubious ownership errors
TestRegisterTaskReposAllowsProjectOnlyURL and
TestRegisterTaskReposSurvivesWorkspaceRefresh fail on GitHub Actions CI
because git clone --bare from local temp directories triggers git's
safe.directory ownership check when the runner UID differs from the
directory owner.

Set safe.directory=* via GIT_CONFIG env vars in gitEnv() so all daemon
git subprocesses trust any directory. The daemon manages its own bare
caches and worktrees, so the ownership check provides no security value.

Co-authored-by: multica-agent <github@multica.ai>
2026-05-01 15:59:46 +02:00
Jiayuan Zhang
374f62be13 feat(inbox): remove redundant mark-as-done hover button, add archive button for done tasks (#1970)
Remove the "mark as done" hover button from inbox list items since it
duplicates the one in the issue detail header. For done tasks, show an
archive button in the issue detail header instead.

Co-authored-by: multica-agent <github@multica.ai>
2026-05-01 09:19:15 +02:00
5 changed files with 107 additions and 44 deletions

View File

@@ -2,7 +2,7 @@
import { StatusIcon } from "../../issues/components";
import { ActorAvatar } from "../../common/actor-avatar";
import { Archive, CircleCheck } from "lucide-react";
import { Archive } from "lucide-react";
import type { InboxItem } from "@multica/core/types";
import { InboxDetailLabel } from "./inbox-detail-label";
import { getInboxDisplayTitle } from "./inbox-display";
@@ -25,13 +25,11 @@ export function InboxListItem({
isSelected,
onClick,
onArchive,
onDone,
}: {
item: InboxItem;
isSelected: boolean;
onClick: () => void;
onArchive: () => void;
onDone?: () => void;
}) {
const displayTitle = getInboxDisplayTitle(item);
@@ -61,26 +59,6 @@ export function InboxListItem({
</span>
</div>
<div className="flex shrink-0 items-center gap-1">
{onDone && (
<span
role="button"
tabIndex={-1}
title="Mark as done"
onClick={(e) => {
e.stopPropagation();
onDone();
}}
onKeyDown={(e) => {
if (e.key === "Enter" || e.key === " ") {
e.stopPropagation();
onDone();
}
}}
className="hidden rounded p-0.5 text-muted-foreground hover:bg-accent hover:text-info group-hover:inline-flex"
>
<CircleCheck className="h-3.5 w-3.5" />
</span>
)}
<span
role="button"
tabIndex={-1}

View File

@@ -20,7 +20,7 @@ import {
useArchiveAllReadInbox,
useArchiveCompletedInbox,
} from "@multica/core/inbox/mutations";
import { useUpdateIssue } from "@multica/core/issues/mutations";
import { IssueDetail } from "../../issues/components";
import { useNavigation } from "../../navigation";
import { toast } from "sonner";
@@ -118,8 +118,6 @@ export function InboxPage() {
const archiveAllMutation = useArchiveAllInbox();
const archiveAllReadMutation = useArchiveAllReadInbox();
const archiveCompletedMutation = useArchiveCompletedInbox();
const updateIssueMutation = useUpdateIssue();
// Auto-mark-read whenever a selected item is unread — covers both click-
// to-select and URL-param-select (e.g. OS notification click on desktop).
// The mutation flips `read: true` optimistically, so this effect settles
@@ -147,18 +145,6 @@ export function InboxPage() {
});
};
const handleDone = (item: InboxItem) => {
if (!item.issue_id) return;
setSelectedKey("");
updateIssueMutation.mutate(
{ id: item.issue_id, status: "done" },
{ onError: () => toast.error("Failed to mark as done") },
);
archiveMutation.mutate(item.id, {
onError: () => toast.error("Failed to archive"),
});
};
// Batch operations
const handleMarkAllRead = () => {
markAllReadMutation.mutate(undefined, {
@@ -249,11 +235,6 @@ export function InboxPage() {
isSelected={(item.issue_id ?? item.id) === selectedKey}
onClick={() => handleSelect(item)}
onArchive={() => handleArchive(item.id)}
onDone={
item.issue_id && item.issue_status !== "done" && item.issue_status !== "cancelled"
? () => handleDone(item)
: undefined
}
/>
))}
</div>

View File

@@ -5,6 +5,7 @@ import { useDefaultLayout, usePanelRef } from "react-resizable-panels";
import { AppLink } from "../../navigation";
import { useNavigation } from "../../navigation";
import {
Archive,
Calendar,
ChevronDown,
ChevronLeft,
@@ -549,6 +550,23 @@ export function IssueDetail({ issueId, onDelete, onDone, defaultSidebarOpen = tr
<TooltipContent side="bottom">Mark as done</TooltipContent>
</Tooltip>
)}
{onDone && issue.status === "done" && (
<Tooltip>
<TooltipTrigger
render={
<Button
variant="ghost"
size="icon-sm"
className="text-muted-foreground"
onClick={() => { onDone(); }}
>
<Archive />
</Button>
}
/>
<TooltipContent side="bottom">Archive</TooltipContent>
</Tooltip>
)}
<Tooltip>
<TooltipTrigger
render={

View File

@@ -10,6 +10,7 @@ import (
"os/exec"
"path/filepath"
"regexp"
"strconv"
"strings"
"sync"
"time"
@@ -19,8 +20,34 @@ import (
// It passes the full daemon environment so credential helpers (e.g. gh) can
// locate their config, and disables TTY prompting so auth failures produce
// clear errors instead of blocking on a non-existent terminal.
//
// safe.directory=* is set via GIT_CONFIG_* env vars so git trusts all
// directories regardless of ownership. The daemon manages its own bare
// caches and worktrees, so the ownership check adds no security value
// and breaks CI environments where the runner UID differs from the
// directory owner.
func gitEnv() []string {
return append(os.Environ(), "GIT_TERMINAL_PROMPT=0")
base := os.Environ()
// Find the existing GIT_CONFIG_COUNT so we append at the next index
// rather than overwriting any env-scoped git config (auth, URL
// rewrites, extra headers, etc.).
existing := 0
for _, e := range base {
if strings.HasPrefix(e, "GIT_CONFIG_COUNT=") {
if n, err := strconv.Atoi(strings.TrimPrefix(e, "GIT_CONFIG_COUNT=")); err == nil {
existing = n
}
}
}
idx := strconv.Itoa(existing)
return append(base,
"GIT_TERMINAL_PROMPT=0",
"GIT_CONFIG_COUNT="+strconv.Itoa(existing+1),
"GIT_CONFIG_KEY_"+idx+"=safe.directory",
"GIT_CONFIG_VALUE_"+idx+"=*",
)
}
// RepoInfo describes a repository to cache.

View File

@@ -44,6 +44,65 @@ func TestGitEnv(t *testing.T) {
if !foundHome {
t.Error("gitEnv() must include HOME from os.Environ()")
}
// Must set safe.directory=* via GIT_CONFIG env vars.
envHas := func(env []string, want string) bool {
for _, e := range env {
if e == want {
return true
}
}
return false
}
if !envHas(env, "GIT_CONFIG_KEY_0=safe.directory") {
t.Error("gitEnv() must include GIT_CONFIG_KEY_0=safe.directory (no pre-existing config)")
}
if !envHas(env, "GIT_CONFIG_VALUE_0=*") {
t.Error("gitEnv() must include GIT_CONFIG_VALUE_0=*")
}
}
func TestGitEnvPreservesExistingConfig(t *testing.T) {
// GIT_CONFIG_COUNT env vars are process-wide; cannot use t.Setenv in
// parallel tests, so run sequentially.
t.Setenv("GIT_CONFIG_COUNT", "2")
t.Setenv("GIT_CONFIG_KEY_0", "url.https://github.com/.insteadOf")
t.Setenv("GIT_CONFIG_VALUE_0", "gh:")
t.Setenv("GIT_CONFIG_KEY_1", "http.extraHeader")
t.Setenv("GIT_CONFIG_VALUE_1", "Authorization: Bearer tok")
env := gitEnv()
envHas := func(want string) bool {
for _, e := range env {
if e == want {
return true
}
}
return false
}
// safe.directory must be appended at index 2 (next available).
if !envHas("GIT_CONFIG_COUNT=3") {
t.Error("expected GIT_CONFIG_COUNT=3")
}
if !envHas("GIT_CONFIG_KEY_2=safe.directory") {
t.Error("expected GIT_CONFIG_KEY_2=safe.directory")
}
if !envHas("GIT_CONFIG_VALUE_2=*") {
t.Error("expected GIT_CONFIG_VALUE_2=*")
}
// Original entries must still be present.
if !envHas("GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf") {
t.Error("existing GIT_CONFIG_KEY_0 was lost")
}
if !envHas("GIT_CONFIG_VALUE_0=gh:") {
t.Error("existing GIT_CONFIG_VALUE_0 was lost")
}
if !envHas("GIT_CONFIG_KEY_1=http.extraHeader") {
t.Error("existing GIT_CONFIG_KEY_1 was lost")
}
}
func TestBareDirName(t *testing.T) {