Merge remote-tracking branch 'public-gh/master' into paperclip-company-import-export

* public-gh/master:
  fix: address greptile follow-up feedback
  docs: clarify quickstart npx usage
  Add guarded dev restart handling
  Fix PAP-576 settings toggles and transcript default
  Add username log censor setting
  fix: use standard toggle component for permission controls

# Conflicts:
#	server/src/routes/agents.ts
#	ui/src/pages/AgentDetail.tsx

packages/shared/src/index.ts

@@ -146,6 +146,7 @@ export type {
   AgentSkillSnapshot,
   AgentSkillSyncRequest,
   InstanceExperimentalSettings,
+  InstanceGeneralSettings,
   InstanceSettings,
   Agent,
   AgentAccessState,
@@ -286,6 +287,9 @@ export type {
 } from "./types/index.js";
 
 export {
+  instanceGeneralSettingsSchema,
+  patchInstanceGeneralSettingsSchema,
+  type PatchInstanceGeneralSettings,
   instanceExperimentalSettingsSchema,
   patchInstanceExperimentalSettingsSchema,
   type PatchInstanceExperimentalSettings,

packages/shared/src/types/index.ts

@@ -1,5 +1,5 @@
 export type { Company } from "./company.js";
-export type { InstanceExperimentalSettings, InstanceSettings } from "./instance.js";
+export type { InstanceExperimentalSettings, InstanceGeneralSettings, InstanceSettings } from "./instance.js";
 export type {
   CompanySkillSourceType,
   CompanySkillTrustLevel,

packages/shared/src/types/instance.ts

@@ -1,9 +1,15 @@
+export interface InstanceGeneralSettings {
+  censorUsernameInLogs: boolean;
+}
+
 export interface InstanceExperimentalSettings {
   enableIsolatedWorkspaces: boolean;
+  autoRestartDevServerWhenIdle: boolean;
 }
 
 export interface InstanceSettings {
   id: string;
+  general: InstanceGeneralSettings;
   experimental: InstanceExperimentalSettings;
   createdAt: Date;
   updatedAt: Date;

packages/shared/src/validators/index.ts

@@ -1,4 +1,8 @@
 export {
+  instanceGeneralSettingsSchema,
+  patchInstanceGeneralSettingsSchema,
+  type InstanceGeneralSettings,
+  type PatchInstanceGeneralSettings,
   instanceExperimentalSettingsSchema,
   patchInstanceExperimentalSettingsSchema,
   type InstanceExperimentalSettings,

packages/shared/src/validators/instance.ts

@@ -1,10 +1,19 @@
 import { z } from "zod";
 
+export const instanceGeneralSettingsSchema = z.object({
+  censorUsernameInLogs: z.boolean().default(false),
+}).strict();
+
+export const patchInstanceGeneralSettingsSchema = instanceGeneralSettingsSchema.partial();
+
 export const instanceExperimentalSettingsSchema = z.object({
   enableIsolatedWorkspaces: z.boolean().default(false),
+  autoRestartDevServerWhenIdle: z.boolean().default(false),
 }).strict();
 
 export const patchInstanceExperimentalSettingsSchema = instanceExperimentalSettingsSchema.partial();
 
+export type InstanceGeneralSettings = z.infer<typeof instanceGeneralSettingsSchema>;
+export type PatchInstanceGeneralSettings = z.infer<typeof patchInstanceGeneralSettingsSchema>;
 export type InstanceExperimentalSettings = z.infer<typeof instanceExperimentalSettingsSchema>;
 export type PatchInstanceExperimentalSettings = z.infer<typeof patchInstanceExperimentalSettingsSchema>;