acff059e92
Plugins/marketplaces GET routes were silently empty because codex-cli.js
never unwrapped the CLI's {installed,available}/{marketplaces} objects
into arrays; backup writes bypassed the symlink-escape guard entirely;
readFileSafe was stricter than every other Codex reader, showing a
symlinked skill/rule in the list and then refusing to open it;
marketplaceAdd only accepted http(s) URLs, rejecting owner/repo sources
the CLI itself takes. Also: docs drift, a dead i18n key, and a scope-cast
hazard in the shared Editor/ConfirmDelete modals.
Fixes, one per finding: unwrap installed/marketplaces in codex-cli.js so
every list route keeps returning a bare list; guard the backup path in
codex-mutate.js with the same assertNotSymlinkEscape the write path
already used (Claude's cc-mutate.js has no such guard on its primary
write path either, so left untouched there); relax readFileSafe's
containment to lexical-only, matching the other four Codex readers,
while leaving the write side's realpath check untouched; reuse
cc-plugin-cli's assertSource for marketplaceAdd instead of a third
validator (ssh remains out of scope, no credential story for it yet).
Server: 1557/1557 (was 1548). Client: tsc -b clean, 469/469 tests.
277 lines
11 KiB
TypeScript
277 lines
11 KiB
TypeScript
/**
|
|
* @file EditorModal.tsx
|
|
* @description Create/edit modal for text-file config artifacts (skills,
|
|
* agents, commands, output styles, memory). Tool-agnostic: it takes a
|
|
* `fetchContent` callback instead of reaching for any particular tool's API,
|
|
* so the same modal serves both the Claude Code and Codex config pages.
|
|
* @author Nguyễn Ngọc Trí Vĩ <vinnt@smartgift.vn>
|
|
*/
|
|
|
|
import { useCallback, useEffect, useState } from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import { Pencil, X, Save, AlertCircle } from "lucide-react";
|
|
import type { CcArtifactType } from "../../lib/api";
|
|
|
|
/** Claude Code's own scope union, kept as the default so existing callers
|
|
* (CcConfig.tsx) don't need to name it. Codex has no `auto-memory` scope —
|
|
* its caller instantiates `TScope` as just `"user" | "project"` instead of
|
|
* casting its own narrower type into this one. */
|
|
type DefaultScope = "user" | "project" | "auto-memory";
|
|
|
|
export type EditorState<
|
|
TType extends string = CcArtifactType,
|
|
TScope extends string = DefaultScope,
|
|
> =
|
|
| {
|
|
mode: "create";
|
|
type: TType;
|
|
defaultScope: "user" | "project";
|
|
template: string;
|
|
project?: string; // set for type === "auto-memory"
|
|
}
|
|
| {
|
|
mode: "edit";
|
|
type: TType;
|
|
scope: TScope;
|
|
name: string;
|
|
filePath: string;
|
|
project?: string; // set for type === "auto-memory"
|
|
}
|
|
| null;
|
|
|
|
/** Types that are a single fixed file per scope (e.g. Claude's CLAUDE.md, Codex's
|
|
* AGENTS.md / config.toml) - no `name` field, and no artifact name is ever sent. */
|
|
const DEFAULT_NAMELESS_TYPES = ["memory"];
|
|
|
|
interface EditorModalProps<
|
|
TType extends string = CcArtifactType,
|
|
TScope extends string = DefaultScope,
|
|
> {
|
|
state: NonNullable<EditorState<TType, TScope>>;
|
|
fetchContent: (filePath: string) => Promise<string>;
|
|
onClose: () => void;
|
|
onSave: (args: {
|
|
type: TType;
|
|
targetScope: TScope;
|
|
name: string | undefined;
|
|
content: string;
|
|
project?: string;
|
|
}) => Promise<void>;
|
|
/** Which `state.type` values are nameless singleton files. Defaults to
|
|
* Claude Code's own `["memory"]` so existing callers are unaffected. */
|
|
namelessTypes?: readonly string[];
|
|
}
|
|
|
|
export function EditorModal<
|
|
TType extends string = CcArtifactType,
|
|
TScope extends string = DefaultScope,
|
|
>({
|
|
state,
|
|
fetchContent,
|
|
onClose,
|
|
onSave,
|
|
namelessTypes = DEFAULT_NAMELESS_TYPES,
|
|
}: EditorModalProps<TType, TScope>) {
|
|
const { t } = useTranslation("ccConfig");
|
|
const isCreate = state.mode === "create";
|
|
const isNameless = namelessTypes.includes(state.type);
|
|
const isAutoMemory = state.type === "auto-memory";
|
|
const [content, setContent] = useState<string>(isCreate ? state.template : "");
|
|
const [name, setName] = useState<string>("");
|
|
const [targetScope, setTargetScope] = useState<"user" | "project">(
|
|
isCreate
|
|
? state.defaultScope
|
|
: state.scope === "auto-memory"
|
|
? "user"
|
|
: (state.scope as "user" | "project")
|
|
);
|
|
const [loading, setLoading] = useState(!isCreate);
|
|
const [saving, setSaving] = useState(false);
|
|
const [error, setError] = useState<string | null>(null);
|
|
|
|
// For edit mode, fetch the actual file content
|
|
useEffect(() => {
|
|
if (state.mode === "edit") {
|
|
setLoading(true);
|
|
fetchContent(state.filePath)
|
|
.then((text) => {
|
|
setContent(text);
|
|
setLoading(false);
|
|
})
|
|
.catch((err: unknown) => {
|
|
const msg = err instanceof Error ? err.message : "unknown";
|
|
setError(msg);
|
|
setLoading(false);
|
|
});
|
|
}
|
|
}, [state, fetchContent]);
|
|
|
|
// Esc to close
|
|
useEffect(() => {
|
|
const onKey = (e: KeyboardEvent) => {
|
|
if (e.key === "Escape") onClose();
|
|
};
|
|
window.addEventListener("keydown", onKey);
|
|
return () => window.removeEventListener("keydown", onKey);
|
|
}, [onClose]);
|
|
|
|
const handleSave = useCallback(async () => {
|
|
setSaving(true);
|
|
setError(null);
|
|
try {
|
|
if (!isNameless && state.mode === "create" && !name) {
|
|
setError(t("edit.nameLabel"));
|
|
setSaving(false);
|
|
return;
|
|
}
|
|
// For auto-memory creates, append a .md extension when the user omits it.
|
|
const createName = isAutoMemory && !/\.md$/i.test(name) ? `${name}.md` : name;
|
|
const effectiveName =
|
|
state.mode === "edit" ? state.name : isNameless ? undefined : createName;
|
|
await onSave({
|
|
type: state.type,
|
|
// Widening back to TScope: this component is the one place that
|
|
// legitimately knows about all three scope shapes across both
|
|
// callers; a Codex caller's TScope ("user" | "project") never
|
|
// actually receives "auto-memory" since isAutoMemory can only be
|
|
// true when TType includes "auto-memory" (Claude-only).
|
|
targetScope: (isAutoMemory ? "auto-memory" : targetScope) as TScope,
|
|
name: effectiveName,
|
|
content,
|
|
project: state.project,
|
|
});
|
|
} catch (err: unknown) {
|
|
const msg = err instanceof Error ? err.message : "unknown";
|
|
setError(t("edit.writeError", { message: msg }));
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}, [state, targetScope, name, content, isAutoMemory, onSave, t]);
|
|
|
|
const titleText = isCreate
|
|
? isAutoMemory
|
|
? t("memory.newFileTitle", { project: state.project ?? "" })
|
|
: t("edit.newTitle", { type: state.type })
|
|
: t("edit.editTitle", { name: state.mode === "edit" ? state.name : "" });
|
|
|
|
return (
|
|
<div
|
|
className="fixed inset-0 bg-black/60 z-40 flex items-center justify-center p-4"
|
|
onClick={onClose}
|
|
>
|
|
<div
|
|
className="relative w-full max-w-4xl max-h-[90vh] rounded-xl border border-border bg-surface-1 flex flex-col"
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
<div className="flex items-center gap-2 border-b border-border px-4 py-2.5">
|
|
<Pencil className="w-4 h-4 text-fg-muted" />
|
|
<span className="text-sm font-medium text-fg-primary flex-1 truncate">{titleText}</span>
|
|
<button
|
|
onClick={onClose}
|
|
className="text-fg-secondary hover:text-fg-primary p-1 rounded-md hover:bg-surface-3"
|
|
aria-label={t("common.close")}
|
|
>
|
|
<X className="w-4 h-4" />
|
|
</button>
|
|
</div>
|
|
|
|
<div className="overflow-auto p-4 space-y-3">
|
|
{isCreate && !isNameless && (
|
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-3">
|
|
<div>
|
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-fg-muted mb-1">
|
|
{t("edit.nameLabel")}
|
|
</label>
|
|
<input
|
|
value={name}
|
|
onChange={(e) => setName(e.target.value)}
|
|
placeholder={
|
|
isAutoMemory ? t("memory.namePlaceholder") : t("edit.namePlaceholder")
|
|
}
|
|
pattern={isAutoMemory ? undefined : "[A-Za-z0-9][A-Za-z0-9._-]{0,63}"}
|
|
className="w-full bg-surface-2 border border-border rounded-md px-3 py-1.5 text-sm font-mono text-fg-primary placeholder:text-fg-muted focus:outline-none focus:border-accent/50"
|
|
/>
|
|
<p className="mt-1 text-[10px] text-fg-muted">
|
|
{isAutoMemory ? t("memory.nameHelp") : t("edit.nameHelp")}
|
|
</p>
|
|
</div>
|
|
{isAutoMemory ? (
|
|
<div>
|
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-fg-muted mb-1">
|
|
{t("memory.projectLabel")}
|
|
</label>
|
|
<div className="rounded-md border border-border bg-surface-2 px-3 py-1.5 font-mono text-[11px] text-fg-secondary truncate">
|
|
{state.project}
|
|
</div>
|
|
<p className="mt-1 text-[10px] text-fg-muted">{t("memory.projectHelp")}</p>
|
|
</div>
|
|
) : (
|
|
<div>
|
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-fg-muted mb-1">
|
|
{t("edit.scopePicker")}
|
|
</label>
|
|
<div className="inline-flex rounded-md border border-border bg-surface-2 p-0.5">
|
|
{(["user", "project"] as const).map((s) => (
|
|
<button
|
|
key={s}
|
|
onClick={() => setTargetScope(s)}
|
|
className={`px-3 py-1 text-[11px] font-medium rounded ${
|
|
targetScope === s
|
|
? "bg-accent/20 text-accent border border-accent/30"
|
|
: "text-fg-secondary hover:text-fg-primary"
|
|
}`}
|
|
>
|
|
{t(`scope.${s}`)}
|
|
</button>
|
|
))}
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
<div>
|
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-fg-muted mb-1">
|
|
{t("edit.contentLabel")}
|
|
</label>
|
|
{loading ? (
|
|
<div className="h-72 rounded-md border border-border bg-surface-2 animate-pulse" />
|
|
) : (
|
|
<textarea
|
|
value={content}
|
|
onChange={(e) => setContent(e.target.value)}
|
|
spellCheck={false}
|
|
className="w-full h-72 bg-surface-2 border border-border rounded-md px-3 py-2 text-[11px] font-mono text-fg-primary placeholder:text-fg-muted focus:outline-none focus:border-accent/50 resize-y"
|
|
/>
|
|
)}
|
|
</div>
|
|
|
|
{error && (
|
|
<div className="rounded-md border border-status-danger/40 bg-status-danger/10 px-3 py-2 text-xs text-status-danger inline-flex items-center gap-2">
|
|
<AlertCircle className="w-3.5 h-3.5" />
|
|
{error}
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
<div className="border-t border-border px-4 py-3 flex items-center justify-end gap-2">
|
|
<button
|
|
onClick={onClose}
|
|
className="text-[12px] font-medium px-3 py-1.5 rounded-md border border-border bg-surface-2 hover:bg-surface-3 text-fg-secondary"
|
|
>
|
|
{t("edit.cancel")}
|
|
</button>
|
|
<button
|
|
onClick={handleSave}
|
|
disabled={saving || loading}
|
|
className="text-[12px] font-medium px-3 py-1.5 rounded-md border border-accent/40 bg-accent/15 hover:bg-accent/25 text-accent inline-flex items-center gap-1.5 disabled:opacity-60"
|
|
>
|
|
<Save className="w-3.5 h-3.5" />
|
|
{saving ? t("edit.saving") : t("edit.save")}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|