mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-23 09:07:46 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - The web UI has keyboard shortcuts for the inbox, task lists, cases, and task detail, plus global shortcuts such as `c`, `/`, `?`, `[`, and `]` > - Shortcut enablement was an instance-wide General setting until #14141 moved it to a per-user preference that defaults to off > - The move did not carry the old instance value over, so every existing user lost shortcuts on upgrade and had to find a new toggle under Profile settings > - A toggle that only turns off a standard, input-safe feature costs a setting, a database column, two API routes, and a React context for little benefit > - This pull request removes both the instance setting and the personal preference and enables keyboard shortcuts for every signed-in user > - The benefit is one less thing to configure, no silent loss of shortcuts on upgrade, and less code to maintain ## Linked Issues or Issue Description Refs #14141 (the change that introduced the personal preference). **What existing behavior does this improve?** Keyboard shortcuts in the web UI stay off unless each user turns them on in Profile settings. **Subsystem affected** Web UI shortcuts, Profile settings, instance general settings, the `/api/auth/preferences` routes, and the `user` table. **Current behavior** Shortcuts default to off per user. #14141 moved the toggle from Instance settings → General to Profile settings and did not carry the old instance value over. Users who had shortcuts on lost them after the upgrade and had to find the new toggle. **Proposed behavior** Keyboard shortcuts are always enabled for every signed-in user. There is no instance setting and no personal preference. Shortcuts already ignore key presses inside text inputs and modal dialogs, so an opt-out is not needed. **Reason and benefit** Fewer settings, no silent loss of shortcuts on upgrade, and removal of a database column, two API routes, a query hook, and a React context that existed only to gate this feature. **Breaking changes** `GET` and `PATCH /api/auth/preferences` are removed. `PATCH /api/instance/settings/general` no longer accepts `keyboardShortcuts`; that schema is strict, so the key now returns 400. `instance.general.keyboardShortcuts` is no longer a valid `PAPERCLIP_HIDDEN_SETTINGS` key; the parser ignores unknown keys with a warning. ## What Changed - Removed the Keyboard shortcuts section from Profile settings, the `useUserPreferences` hook, `queryKeys.auth.preferences`, and `authApi.getPreferences` / `authApi.updatePreferences`. - Removed `GeneralSettingsContext`. The inbox, legacy inbox, task list, legacy task list, cases, and task detail pages no longer gate their key handlers. - Removed the `enabled` option from `useKeyboardShortcuts`. The app shell always registers the global shortcuts. - Removed `GET` and `PATCH /api/auth/preferences`, their OpenAPI entries, and the `currentUserPreferencesSchema` / `updateCurrentUserPreferencesSchema` validators. - Removed `keyboardShortcuts` from `InstanceGeneralSettings`, the general settings zod schema, the settings service defaults, and `HIDEABLE_GENERAL_SECTIONS`. - Added migration `0289_drop_user_keyboard_shortcuts`, which drops `user.keyboard_shortcuts`. - Updated `AGENTS.md`, `doc/SPEC.md`, `doc/SPEC-implementation.md`, and `docs/deploy/environment-variables.md`. - Parsed the stored general settings row with `instanceGeneralSettingsSchema.strip()` in the feedback vote path, so a retired key left in the row cannot reset the sharing preference to `prompt` and overwrite the stored choice. - Kept every bare global shortcut (`c`, `?`, `[`, `]`, `/`) out of open modal dialogs in `useKeyboardShortcuts`; only `/` had that guard before. - Updated the affected tests and added a Profile settings test that asserts the toggle is gone, a hook test for the modal dialog guard, and a feedback service regression test for the retired-key case. ## Verification - Typecheck passes for `@paperclipai/shared`, `@paperclipai/db` (including the migration numbering and safety checks), `@paperclipai/server`, and `ui`. - `pnpm exec vitest run server/src/__tests__/instance-settings-routes.test.ts server/src/__tests__/openapi-routes.test.ts server/src/__tests__/auth-routes.test.ts server/src/__tests__/sentry.test.ts` → 119 passed. - `pnpm exec vitest run ui/src/components/Layout.test.tsx ui/src/pages/ProfileSettings.test.tsx ui/src/pages/IssueDetail.test.tsx ui/src/pages/Inbox.test.tsx ui/src/pages/Cases.test.tsx ui/src/hooks/useKeyboardShortcuts.test.tsx ui/src/pages/Agents.test.tsx ui/src/pages/InstanceGeneralSettings.test.tsx` → 286 passed. - `pnpm exec vitest run packages/shared/src/settings-visibility.test.ts` → 16 passed. - `pnpm exec vitest run ui/src/hooks/useKeyboardShortcuts.test.tsx` → 7 passed. - `pnpm exec vitest run server/src/__tests__/feedback-service.test.ts` (embedded Postgres) → the new retired-key test passes with the fix and fails without it. - Manual: sign in with no settings changed, open the inbox, press `j` and `k` to move the selection, press `?` to open the cheatsheet. Open Settings → Profile and confirm there is no Keyboard shortcuts section. ## Risks - The migration drops a column. It uses `DROP COLUMN IF EXISTS`, and the column has no readers after this change. If you roll back to a build from before this PR after the migration has run, re-add the column first: `ALTER TABLE "user" ADD COLUMN "keyboard_shortcuts" boolean DEFAULT false NOT NULL;`. The older build's ORM selects that column when it loads users. - Any external client that still sends `keyboardShortcuts` to `PATCH /api/instance/settings/general` receives a 400. No in-repo client does. - Stored `instance_settings.general.keyboardShortcuts` values are stripped on read and ignored. - Users who never turned the toggle on now get shortcuts. The handlers skip text inputs, contenteditable regions, and modal dialogs, so typing is unaffected. ## Model Used Claude Fable 5.1 (`claude-fable-5-1`) in Claude Code, with extended thinking and tool use. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge
223 lines
7.8 KiB
TypeScript
223 lines
7.8 KiB
TypeScript
import { z } from "zod";
|
|
import {
|
|
AGENT_ADAPTER_TYPES,
|
|
HUMAN_COMPANY_MEMBERSHIP_ROLES,
|
|
INVITE_JOIN_TYPES,
|
|
JOIN_REQUEST_STATUSES,
|
|
JOIN_REQUEST_TYPES,
|
|
PERMISSION_KEYS,
|
|
} from "../constants.js";
|
|
import { optionalAgentAdapterTypeSchema } from "../adapter-type.js";
|
|
|
|
export const createCompanyInviteSchema = z.object({
|
|
allowedJoinTypes: z.enum(INVITE_JOIN_TYPES).default("both"),
|
|
humanRole: z.enum(HUMAN_COMPANY_MEMBERSHIP_ROLES).optional().nullable(),
|
|
defaultsPayload: z.record(z.string(), z.unknown()).optional().nullable(),
|
|
agentMessage: z.string().max(4000).optional().nullable(),
|
|
});
|
|
|
|
export type CreateCompanyInvite = z.infer<typeof createCompanyInviteSchema>;
|
|
|
|
export const createOpenClawInvitePromptSchema = z.object({
|
|
agentMessage: z.string().max(4000).optional().nullable(),
|
|
});
|
|
|
|
export type CreateOpenClawInvitePrompt = z.infer<
|
|
typeof createOpenClawInvitePromptSchema
|
|
>;
|
|
|
|
export const acceptInviteSchema = z.object({
|
|
requestType: z.enum(JOIN_REQUEST_TYPES),
|
|
agentName: z.string().min(1).max(120).optional(),
|
|
adapterType: optionalAgentAdapterTypeSchema,
|
|
capabilities: z.string().max(4000).optional().nullable(),
|
|
agentDefaultsPayload: z.record(z.string(), z.unknown()).optional().nullable(),
|
|
// OpenClaw join compatibility fields accepted at top level.
|
|
responsesWebhookUrl: z.string().max(4000).optional().nullable(),
|
|
responsesWebhookMethod: z.string().max(32).optional().nullable(),
|
|
responsesWebhookHeaders: z.record(z.string(), z.unknown()).optional().nullable(),
|
|
paperclipApiUrl: z.string().max(4000).optional().nullable(),
|
|
webhookAuthHeader: z.string().max(4000).optional().nullable(),
|
|
});
|
|
|
|
export type AcceptInvite = z.infer<typeof acceptInviteSchema>;
|
|
|
|
export const listJoinRequestsQuerySchema = z.object({
|
|
status: z.enum(JOIN_REQUEST_STATUSES).optional(),
|
|
requestType: z.enum(JOIN_REQUEST_TYPES).optional(),
|
|
});
|
|
|
|
export type ListJoinRequestsQuery = z.infer<typeof listJoinRequestsQuerySchema>;
|
|
|
|
export const listCompanyInvitesQuerySchema = z.object({
|
|
state: z.enum(["active", "revoked", "accepted", "expired"]).optional(),
|
|
limit: z.coerce.number().int().min(1).max(100).optional().default(20),
|
|
offset: z.coerce.number().int().min(0).optional().default(0),
|
|
});
|
|
|
|
export type ListCompanyInvitesQuery = z.infer<typeof listCompanyInvitesQuerySchema>;
|
|
|
|
export const claimJoinRequestApiKeySchema = z.object({
|
|
claimSecret: z.string().min(16).max(256),
|
|
});
|
|
|
|
export type ClaimJoinRequestApiKey = z.infer<typeof claimJoinRequestApiKeySchema>;
|
|
|
|
export const boardCliAuthAccessLevelSchema = z.enum([
|
|
"board",
|
|
"instance_admin_required",
|
|
]);
|
|
|
|
export type BoardCliAuthAccessLevel = z.infer<typeof boardCliAuthAccessLevelSchema>;
|
|
|
|
export const createCliAuthChallengeSchema = z.object({
|
|
command: z.string().min(1).max(240),
|
|
clientName: z.string().max(120).optional().nullable(),
|
|
requestedAccess: boardCliAuthAccessLevelSchema.default("board"),
|
|
requestedCompanyId: z.string().guid().optional().nullable(),
|
|
});
|
|
|
|
export type CreateCliAuthChallenge = z.infer<typeof createCliAuthChallengeSchema>;
|
|
|
|
export const resolveCliAuthChallengeSchema = z.object({
|
|
token: z.string().min(16).max(256),
|
|
});
|
|
|
|
export type ResolveCliAuthChallenge = z.infer<typeof resolveCliAuthChallengeSchema>;
|
|
|
|
export const createBoardApiKeySchema = z.object({
|
|
name: z.string().trim().min(1).max(120).default("paperclipai cli"),
|
|
expiresAt: z.coerce.date().optional().nullable(),
|
|
requestedCompanyId: z.string().guid().optional().nullable(),
|
|
});
|
|
|
|
export type CreateBoardApiKey = z.infer<typeof createBoardApiKeySchema>;
|
|
|
|
export const updateMemberPermissionsSchema = z.object({
|
|
grants: z.array(
|
|
z.object({
|
|
permissionKey: z.enum(PERMISSION_KEYS),
|
|
scope: z.record(z.string(), z.unknown()).optional().nullable(),
|
|
}),
|
|
),
|
|
});
|
|
|
|
export type UpdateMemberPermissions = z.infer<typeof updateMemberPermissionsSchema>;
|
|
|
|
const editableMembershipStatuses = ["pending", "active", "suspended"] as const;
|
|
|
|
export const updateCompanyMemberSchema = z.object({
|
|
membershipRole: z.enum(HUMAN_COMPANY_MEMBERSHIP_ROLES).optional().nullable(),
|
|
status: z.enum(editableMembershipStatuses).optional(),
|
|
}).refine((value) => value.membershipRole !== undefined || value.status !== undefined, {
|
|
message: "membershipRole or status is required",
|
|
});
|
|
|
|
export type UpdateCompanyMember = z.infer<typeof updateCompanyMemberSchema>;
|
|
|
|
export const updateCompanyMemberWithPermissionsSchema = z.object({
|
|
membershipRole: z.enum(HUMAN_COMPANY_MEMBERSHIP_ROLES).optional().nullable(),
|
|
status: z.enum(editableMembershipStatuses).optional(),
|
|
grants: updateMemberPermissionsSchema.shape.grants.default([]),
|
|
}).refine((value) => value.membershipRole !== undefined || value.status !== undefined, {
|
|
message: "membershipRole or status is required",
|
|
});
|
|
|
|
export type UpdateCompanyMemberWithPermissions = z.infer<typeof updateCompanyMemberWithPermissionsSchema>;
|
|
|
|
export const archiveCompanyMemberSchema = z.object({
|
|
reassignment: z
|
|
.object({
|
|
assigneeAgentId: z.string().guid().optional().nullable(),
|
|
assigneeUserId: z.string().guid().optional().nullable(),
|
|
})
|
|
.optional()
|
|
.nullable(),
|
|
}).superRefine((value, ctx) => {
|
|
if (value.reassignment?.assigneeAgentId && value.reassignment.assigneeUserId) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
message: "Choose either an agent or user reassignment target",
|
|
path: ["reassignment"],
|
|
});
|
|
}
|
|
});
|
|
|
|
export type ArchiveCompanyMember = z.infer<typeof archiveCompanyMemberSchema>;
|
|
|
|
export const updateUserCompanyAccessSchema = z.object({
|
|
companyIds: z.array(z.string().guid()).default([]),
|
|
});
|
|
|
|
export type UpdateUserCompanyAccess = z.infer<typeof updateUserCompanyAccessSchema>;
|
|
|
|
export const searchAdminUsersQuerySchema = z.object({
|
|
query: z.string().trim().max(120).optional().default(""),
|
|
});
|
|
|
|
export type SearchAdminUsersQuery = z.infer<typeof searchAdminUsersQuerySchema>;
|
|
|
|
const profileImageAssetPathPattern = /^\/api\/assets\/[^/?#]+\/content(?:\?[^#]*)?(?:#.*)?$/;
|
|
|
|
function isValidProfileImage(value: string): boolean {
|
|
if (profileImageAssetPathPattern.test(value)) return true;
|
|
|
|
try {
|
|
const url = new URL(value);
|
|
return url.protocol === "https:" || url.protocol === "http:";
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
const profileImageSchema = z
|
|
.string()
|
|
.trim()
|
|
.min(1)
|
|
.max(4000)
|
|
.refine(isValidProfileImage, { message: "Invalid profile image URL" });
|
|
|
|
export const currentUserProfileSchema = z.object({
|
|
id: z.string().min(1),
|
|
email: z.preprocess(
|
|
(v) => (typeof v === "string" && v.trim() === "" ? null : v),
|
|
z.string().email().nullable(),
|
|
),
|
|
name: z.preprocess(
|
|
(v) => (typeof v === "string" && v.trim() === "" ? null : v),
|
|
z.string().min(1).max(120).nullable(),
|
|
),
|
|
image: profileImageSchema.nullable(),
|
|
});
|
|
|
|
export type CurrentUserProfile = z.infer<typeof currentUserProfileSchema>;
|
|
|
|
export const authSessionSchema = z.object({
|
|
session: z.object({
|
|
id: z.string().min(1),
|
|
userId: z.string().min(1),
|
|
}),
|
|
user: currentUserProfileSchema,
|
|
// The front-end Sentry DSN for the current instance, or `null` when the
|
|
// operator has set neither `SENTRY_DSN_FRONTEND` nor the legacy
|
|
// `SENTRY_DSN`. Required, not optional: a missing value must fail the
|
|
// response schema instead of silently disabling browser error
|
|
// monitoring. The browser reads this value to open its own Sentry gate —
|
|
// see `ui/src/lib/sentry.ts`.
|
|
sentryDsn: z.string().min(1).nullable(),
|
|
// Optional for browser/server version skew; null leaves the SDK default.
|
|
sentryEnvironment: z.string().nullable().optional(),
|
|
});
|
|
|
|
export type AuthSession = z.infer<typeof authSessionSchema>;
|
|
|
|
export const updateCurrentUserProfileSchema = z.object({
|
|
name: z.string().trim().min(1).max(120),
|
|
image: z
|
|
.union([profileImageSchema, z.literal(""), z.null()])
|
|
.optional()
|
|
.transform((value) => value === "" ? null : value),
|
|
});
|
|
|
|
export type UpdateCurrentUserProfile = z.infer<typeof updateCurrentUserProfileSchema>;
|