merge: resolve dev conflicts for cookie authentication

Author: feng626

LICENSE

@@ -60,7 +60,7 @@ func main() {
 
 func run(settings config.Config, logger *zap.Logger) error {
 	tlsVerify := !settings.IgnoreVerifyCerts
-	componentClient, err := component.Connect(component.Options{CoreURL: settings.CoreHost, TLSVerify: tlsVerify, Timeout: settings.HTTPRequestTimeout, Name: settings.Name, BootstrapToken: settings.BootstrapToken, AccessKeyFile: settings.AccessKeyFilePath})
+	componentClient, err := component.Connect(component.Options{CoreURL: settings.CoreHost, TLSVerify: tlsVerify, Timeout: settings.HTTPRequestTimeout, Name: settings.Name, BootstrapToken: settings.BootstrapToken, AccessKeyFile: settings.AccessKeyFilePath, Logger: logger})
 	if err != nil {
 		return err
 	}
@@ -69,15 +69,8 @@ func run(settings config.Config, logger *zap.Logger) error {
 		return err
 	}
 	defer engine.Close()
-	var runtimeStore ports.Store
-	switch settings.RuntimeStore {
-	case "core":
-		runtimeStore, err = store.NewCore(componentClient, settings.RuntimeDataFolderPath)
-	case "jsonl":
-		runtimeStore, err = store.NewJSONL(settings.RuntimeDataFolderPath)
-	default:
-		return fmt.Errorf("unsupported runtime store %q", settings.RuntimeStore)
-	}
+	retention := store.RetentionOptions{KeepDays: settings.TerminalAIKeepDays, MaxBytes: settings.TerminalAIMaxBytes, MinFreeBytes: settings.TerminalAIMinFreeBytes}
+	runtimeStore, err := store.NewCore(componentClient, settings.RuntimeDataFolderPath, retention)
 	if err != nil {
 		return err
 	}
@@ -91,7 +84,7 @@ func run(settings config.Config, logger *zap.Logger) error {
 			return err
 		}
 	}
-	runtimeService, err := service.New(service.Options{Store: runtimeStore, Engine: engine, Bus: bus, Logger: logger, InstanceID: settings.Name, Workers: 4, ToolResultTimeout: settings.ToolResultTimeout, ArtifactDir: settings.ArtifactFolderPath, Capability: capability, StorageKind: settings.RuntimeStore, StorageDurable: true})
+	runtimeService, err := service.New(service.Options{Store: runtimeStore, Engine: engine, Bus: bus, Logger: logger, InstanceID: settings.Name, Workers: 4, ToolResultTimeout: settings.ToolResultTimeout, ArtifactDir: settings.ArtifactFolderPath, Capability: capability, StorageKind: "core", StorageDurable: true})
 	if err != nil {
 		return err
 	}
@@ -114,7 +107,7 @@ func run(settings config.Config, logger *zap.Logger) error {
 	heartbeatContext, cancelHeartbeat := context.WithCancel(context.Background())
 	defer cancelHeartbeat()
 	go componentClient.RunHeartbeat(heartbeatContext, logger)
-	logger.Info("kael started", zap.String("address", httpServer.Addr), zap.String("version", Version), zap.String("component", settings.Name), zap.String("model", engine.Info().Model), zap.String("storage", settings.RuntimeStore))
+	logger.Info("kael started", zap.String("address", httpServer.Addr), zap.String("version", Version), zap.String("component", settings.Name), zap.String("model", engine.Info().Model), zap.String("storage", "core"), zap.String("terminal_storage", "jsonl"))
 	signals, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 	var serveErr error

cmd/kael/main.go

@@ -21,10 +21,18 @@ BOOTSTRAP_TOKEN: <PleaseChangeMe>
 # 同时写入 stdout 和 data/logs/kael.log；文件达到 50 MB 时轮转，保留 7 份、7 天。
 # LOG_LEVEL: INFO
 
-# Runtime 状态默认通过组件签名写回 JumpServer Core。
-# 仅本地开发或 Core 尚未提供 runtime-store API 时预先选择 jsonl；两种 Store 不双写，
-# 禁止在 Core 故障时自动切到 jsonl，否则会形成缺少现有历史的第二个写权威。
-# RUNTIME_STORE: core
+# 普通会话的问答历史通过组件签名写回 JumpServer Core。
+# Terminal AI 固定写入 data/terminal/，保留本地可读事件 JSONL，不上传 Core。
+# 按最后一次消息/会话更新时间保留，活跃 Run 和有效 Panel 不清理。
+# 启动及每小时清理过期会话；容量达到 90% 或磁盘余量不足时，
+# 每分钟最多淘汰 100 个最旧的非活跃会话，目标降至 80%。
+# 容量统计包含 data/terminal/ 下的 store/、events/ 及快照临时文件。
+# 附件原始文件和普通服务日志不属于该配额。
+# 新请求额外预留最多 64 MiB 给在途执行；空间不足返回 storage_capacity_exceeded。
+# 清理既有超额数据时允许有界的临时快照开销，实际磁盘必须容纳完整快照。
+# TERMINAL_AI_KEEP_DAYS: 7
+# TERMINAL_AI_MAX_BYTES: 1073741824
+# TERMINAL_AI_MIN_FREE_BYTES: 1073741824
 
 # 标准浏览器部署由 Lina 所在站点把 /kael/ 同源反向代理到 Kael。若网关终止 HTTPS，
 # 优先在这里精确填写 Lina 的外部 origin，避免 Kael 所见内部 HTTP 导致 Origin 拒绝。